diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index 65b183d569..d20629497d 100644
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -69,7 +69,7 @@
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 !include ..\makewat.env
 
-LIBTARGET   = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBGUSUFFIX)$(WATCOM_SUFFIX).lib
+LIBTARGET   = $(WXDIR)\lib\$(LIBNAME).lib
 
 EXTRATARGETS = png zlib jpeg tiff regex
 EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex
diff --git a/src/makewat.env b/src/makewat.env
index 9672a1a677..d69a9762d9 100644
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -19,7 +19,9 @@ wxUSE_GUI=1
 !endif
 
 # set FINAL=1 to disable debug and enable optimizations
+!ifndef FINAL
 FINAL=0
+!endif
 
 # set WATCOM_SUFFIX to nothing if you use only Watcom compiler, set it to
 # something Watcom-specific if you want to build wxWindows with more than one
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 388cac253c..e68fac4ba4 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -11,7 +11,7 @@
 # Makefile : Builds wxWindows library for Watcom C++, WIN32
 !include ..\makewat.env
 
-LIBTARGET   = $(WXDIR)\lib\wx$(TOOLKIT)$(DEBGUSUFFIX)$(WATCOM_SUFFIX).lib
+LIBTARGET = $(WXDIR)\lib\$(LIBNAME).lib
 
 EXTRATARGETS = png zlib jpeg tiff regex
 EXTRATARGETSCLEAN = clean_png clean_zlib clean_jpeg clean_tiff clean_regex