diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 72017d86a4..3e451023be 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,9 +17,19 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-09 13:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * bin/postinst.bat
+    + Adding watt lib to hbmk.cfg at postinst phase.
+
+  * contrib/hbnetio/utils/netiosrv.hbp
+    + Added 8.3 output name for dos platforms.
+
+  * config/detfun.mk
+    + Always export HB_HAS_* variables.
+
 2009-09-09 12:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   + contrib/hbnetio/utils/netiosrv.hbp
-    * Added project file which will include platform name in
+    + Added project file which will include platform name in
       target netiosrv executable name.
 
 2009-09-09 10:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
@@ -10251,7 +10261,7 @@
         (UADOS instead of UA1125).
       - Fixed date format which must only contain YYYY, MM, DD
         regardless of the CP/language used, since it's a picture mask.
-      - Formatting (semicolon, spaces, deleted embedded $Id$ not
+      - Formatting (semicolon, spaces, deleted embedded repository ID not
         needed with SVN)
       - Added to hbextern.ch.
 
diff --git a/harbour/bin/postinst.bat b/harbour/bin/postinst.bat
index d0b898b337..de88971f77 100644
--- a/harbour/bin/postinst.bat
+++ b/harbour/bin/postinst.bat
@@ -36,6 +36,11 @@ echo libpaths=../contrib/rddsql/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 echo libpaths=../addons/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 echo libpaths=../examples/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
 
+if not "%HB_HAS_WATT%" == "" echo.>> %HB_BIN_INSTALL%\hbmk.cfg
+if not "%HB_HAS_WATT%" == "" echo {dos&djgpp}syslibs=watt>> %HB_BIN_INSTALL%\hbmk.cfg
+if not "%HB_HAS_WATT%" == "" echo {dos&watcom}syslibs=wattcpwf>> %HB_BIN_INSTALL%\hbmk.cfg
+if not "%HB_HAS_WATT%" == "" echo {dos}libpaths=${WATT_ROOT}/lib>> %HB_BIN_INSTALL%\hbmk.cfg
+
 if "%HB_SHELL%" == "nt" goto _SH_NT
 
    if "%HB_INSTALL_PREFIX%" == "" goto _NO_COPYD
diff --git a/harbour/config/detfun.mk b/harbour/config/detfun.mk
index 1ef986777c..8489fccfe5 100644
--- a/harbour/config/detfun.mk
+++ b/harbour/config/detfun.mk
@@ -112,6 +112,8 @@ ifeq ($($(_DET_VAR_HAS_)),)
    endif
 endif
 
+export $(_DET_VAR_HAS_)
+
 _DET_DSP_NAME :=
 _DET_VAR_INC_ :=
 _DET_VAR_HAS_ :=
diff --git a/harbour/contrib/hbnetio/utils/netiosrv.hbp b/harbour/contrib/hbnetio/utils/netiosrv.hbp
index be4ca8647c..96f173740e 100644
--- a/harbour/contrib/hbnetio/utils/netiosrv.hbp
+++ b/harbour/contrib/hbnetio/utils/netiosrv.hbp
@@ -3,4 +3,5 @@
 #
 
 netiosrv.prg
--onetiosrv_${hb_plat}
+-o{!dos}netiosrv_${hb_plat}
+-o{dos}netiodos