diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b9fadae952..ab33f21535 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-06 18:12 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * bin/hb-mkdyn.bat
+    * owatcom tweaks. Build is still going dunno if this will be okay.
+
+  * contrib/hbqt/generator/rebuild_hbqt.bat
+    * Added hbmk2 dir.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed stupid MSVC typo.
+
 2009-04-06 17:58 UTC+0200 Francesco Saverio Giudice (info/at/fsgiudice.com)
   + harbour/contrib/hbqt/generator/rebuild_hbqt.bat
     + Added batch to generate fresh hbqt sources from headers
diff --git a/harbour/bin/hb-mkdyn.bat b/harbour/bin/hb-mkdyn.bat
index 31584b2be2..4d6ab20984 100644
--- a/harbour/bin/hb-mkdyn.bat
+++ b/harbour/bin/hb-mkdyn.bat
@@ -20,7 +20,7 @@ if "%HB_ARCHITECTURE%" == "" ( echo HB_ARCHITECTURE needs to be set. && goto END
 if "%HB_COMPILER%" == "" ( echo HB_COMPILER needs to be set. && goto END )
 
 set HB_DLL_VERSION=11
-set HB_DLL_LIBS=hbcommon hbpp hbrtl hbmacro hblang hbcpage hbpcre hbzlib hbextern hbrdd rddntx rddnsx rddcdx rddfpt hbsix hbhsx hbusrrdd gtcgi gtpca gtstd gtwvt gtgui hbmaindllh
+set HB_DLL_LIBS=hbcommon hbpp hbrtl hbmacro hblang hbcpage hbpcre hbzlib hbextern hbrdd rddntx rddnsx rddcdx rddfpt hbsix hbhsx hbusrrdd gtcgi gtpca gtstd gtwvt gtgui
 set HB_DLL_LIBS_WIN=gtwin
 set HB_DLL_LIBS_ST=hbvm
 set HB_DLL_LIBS_MT=hbvmmt
@@ -291,12 +291,14 @@ goto END
 
 echo Making .dlls for %HB_ARCHITECTURE% / %HB_COMPILER%...
 
+set HB_DLL_LIBS_EXTRA=hbmaindllh
+
 md _dll
 cd _dll
 
 echo.> _hbsst.txt
 echo.> _hbsmt.txt
-for %%f in (%HB_DLL_LIBS% %HB_DLL_LIBS_WIN%) do (
+for %%f in (%HB_DLL_LIBS% %HB_DLL_LIBS_WIN% %HB_DLL_LIBS_EXTRA%) do (
    echo FILE '%HB_LIB_INSTALL%\%%f.lib'>> _hbsst.txt
    echo FILE '%HB_LIB_INSTALL%\%%f.lib'>> _hbsmt.txt
 )
diff --git a/harbour/contrib/hbqt/generator/rebuild_hbqt.bat b/harbour/contrib/hbqt/generator/rebuild_hbqt.bat
index a78b810ad6..922b9beef2 100644
--- a/harbour/contrib/hbqt/generator/rebuild_hbqt.bat
+++ b/harbour/contrib/hbqt/generator/rebuild_hbqt.bat
@@ -5,7 +5,7 @@ rem
 IF %HB_COMPILER%.==. GOTO ERR_ENV
 
 echo. Making hbqtgen ...
-hbmk2.exe hbqtgen
+..\..\..\bin\hbmk2.exe hbqtgen
 echo. done
 echo.
 echo. Cleaning gensource and doc folders ...
@@ -56,4 +56,3 @@ echo. set HB_COMPILER=mingw
 echo. and your PATH, then restart this batch.
 
 :END_BATCH
-
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 719c6a24d0..bb2017d3f3 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -915,14 +915,14 @@ FUNCTION Main( ... )
 
          OutStd( s_cHB_BIN_INSTALL )
 
-      CASE cParamL == "--hbdirlib"       ; lStopAfterInit := .T.
-
-         OutStd( s_cHB_LIB_INSTALL )
-
       CASE cParamL == "--hbdirdyn"       ; lStopAfterInit := .T.
 
          OutStd( s_cHB_DYN_INSTALL )
 
+      CASE cParamL == "--hbdirlib"       ; lStopAfterInit := .T.
+
+         OutStd( s_cHB_LIB_INSTALL )
+
       CASE cParamL == "--hbdirinc"       ; lStopAfterInit := .T.
 
          OutStd( s_cHB_INC_INSTALL )
@@ -1768,7 +1768,7 @@ FUNCTION Main( ... )
            ( t_cARCH == "win" .AND. t_cCOMP == "msvcce" ) .OR. ;
            ( t_cARCH == "wce" .AND. t_cCOMP == "msvcarm" ) /* NOTE: Cross-platform: wce/ARM on win/x86 */
          IF s_lDEBUG
-            IF t_cCOMP $ "msvcce|msvcarm"
+            IF t_cCOMP == "msvcce" .OR. t_cCOMP == "msvcarm"
                AAdd( s_aOPTC, "-Zi" )
             ELSE
                AAdd( s_aOPTC, "-MTd -Zi" )
@@ -1801,7 +1801,7 @@ FUNCTION Main( ... )
             AAdd( s_aOPTC, "-Fm" )
             AAdd( s_aOPTD, "-Fm" )
          ENDIF
-         IF t_cCOMP $ "msvcce|msvcarm"
+         IF t_cCOMP == "msvcce" .OR. t_cCOMP == "msvcarm"
             /* NOTE: Copied from .cf. Probably needs cleaning. */
             AAdd( s_aOPTC, "-D_WIN32_WCE=0x420" )
             AAdd( s_aOPTC, "-DUNDER_CE=0x420" )
@@ -1841,7 +1841,7 @@ FUNCTION Main( ... )
          IF s_lSHARED
             AAdd( s_aOPTL, "/libpath:{DB}" )
          ENDIF
-         IF t_cCOMP $ "msvcce|msvcarm"
+         IF t_cCOMP == "msvcce" .OR. t_cCOMP == "msvcarm"
             s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "wininet", "ws2", "commdlg", "commctrl" } )
             s_aLIBSYS := ArrayJoin( s_aLIBSYS, { "uuid", "ole32" } )
          ELSE
@@ -1863,7 +1863,7 @@ FUNCTION Main( ... )
                                           "harbour-" + cDL_Version_Alter + "-ia64" ),;
                               "hbmainstd",;
                               "hbmainwin" }
-         CASE t_cCOMP $ "msvcce|msvcarm"
+         CASE t_cCOMP == "msvcce" .OR. t_cCOMP == "msvcarm"
             s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm",;
                                           "harbour-" + cDL_Version_Alter + "-arm" ),;
                               "hbmainstd",;
@@ -3692,8 +3692,8 @@ STATIC PROCEDURE ShowHelp( lLong )
       "  -hblib            create static library" ,;
       "  -hbdyn            create dynamic library (experimental)" ,;
       "  --hbdirbin        output Harbour binary directory" ,;
-      "  --hbdirlib        output Harbour static library directory" ,;
       "  --hbdirdyn        output Harbour dynamic library directory" ,;
+      "  --hbdirlib        output Harbour static library directory" ,;
       "  --hbdirinc        output Harbour header directory" ,;
       "" ,;
       "  -arch=<arch>      assume specific architecure. Same as HB_ARCHITECTURE envvar" ,;