diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7e36f40bf4..7aa920dc62 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,22 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-30 17:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbfbird/Makefile
+  * contrib/gtalleg/Makefile
+    - Disabled for poccce due to errors.
+
+  * contrib/hbfimage/fi_winfu.c
+    - Disabled Windows specific functions for poccce due to errors.
+
+  * config/win/owatcom.cf
+    % Removed -bm (MT mode) switch, because besides creating MT friendly
+      code, it kills performance. Pls shout if MT mode is now broken in
+      any ways.
+
+  * mpkg_win.bat
+    * Generate .zip file first.
+
 2009-03-30 13:53 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * contrib/gtalleg/Makefile
     - Disabled for minwgce.
diff --git a/harbour/config/win/owatcom.cf b/harbour/config/win/owatcom.cf
index 90cfe66fa6..da11cfb0b7 100644
--- a/harbour/config/win/owatcom.cf
+++ b/harbour/config/win/owatcom.cf
@@ -29,7 +29,7 @@ endif
 CC_IN =
 CC_OUT = -fo=
 
-CPPFLAGS = -zq -bt=NT -bm
+CPPFLAGS = -zq -bt=NT
 
 ifneq ($(HB_BUILD_WARN),no)
 CPPFLAGS += -w3
diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile
index 102afe832e..a5c9ac813b 100644
--- a/harbour/contrib/gtalleg/Makefile
+++ b/harbour/contrib/gtalleg/Makefile
@@ -7,6 +7,7 @@ ROOT = ../../
 LIBNAME=gtalleg
 
 ifneq ($(HB_COMPILER),pocc)
+ifneq ($(HB_COMPILER),poccce)
 ifneq ($(HB_COMPILER),xcc)
 ifneq ($(HB_COMPILER),dmc)
 ifneq ($(HB_COMPILER),owatcom)
@@ -48,3 +49,6 @@ endif
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
+else
+include $(TOP)$(ROOT)config/none.cf
+endif
diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile
index 8977c463fc..acebafe2fe 100644
--- a/harbour/contrib/hbfbird/Makefile
+++ b/harbour/contrib/hbfbird/Makefile
@@ -6,6 +6,8 @@ ROOT = ../../
 
 LIBNAME=hbfbird
 
+ifneq ($(HB_COMPILER),poccce)
+
 ifeq ($(HB_INC_FIREBIRD),)
 ifeq ($(HB_XBUILD),)
 HB_INC_FIREBIRD = /usr/include /opt/firebird/include
@@ -29,3 +31,6 @@ include $(TOP)$(ROOT)config/lib.cf
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
+else
+include $(TOP)$(ROOT)config/none.cf
+endif
diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c
index b55391a51b..78abbe096f 100644
--- a/harbour/contrib/hbfimage/fi_winfu.c
+++ b/harbour/contrib/hbfimage/fi_winfu.c
@@ -55,7 +55,7 @@
 #include "hbapi.h"
 #include "hbapierr.h"
 
-#if defined(HB_OS_WIN)
+#if defined(HB_OS_WIN) && ! ( defined(HB_OS_WIN_CE) && defined(__POCC__) )
 
 #if !defined(_WINDOWS_) && ( defined(__GNUC__) || defined(__POCC__) || defined(__XCC__) ) || defined(__WATCOMC__)
    #define _WINDOWS_
diff --git a/harbour/mpkg_win.bat b/harbour/mpkg_win.bat
index a30e0818cd..dca8327fef 100644
--- a/harbour/mpkg_win.bat
+++ b/harbour/mpkg_win.bat
@@ -71,9 +71,6 @@ xcopy /D /Y ERRATA    "%HB_INSTALL_PREFIX%\"
 xcopy /D /Y INSTALL   "%HB_INSTALL_PREFIX%\"
 xcopy /D /Y TODO      "%HB_INSTALL_PREFIX%\"
 
-rem ; Build installer package
-makensis.exe %~dp0mpkg_win.nsi
-
 rem ; Build .zip package
 if exist %HB_PKGNAME%.zip del %HB_PKGNAME%.zip
 pushd
@@ -81,6 +78,9 @@ cd %HB_INSTALL_BASE%
 zip -9 -X -r -o %~dp0%HB_PKGNAME%.zip . -i %HB_DIRNAME%\*
 popd
 
+rem ; Build installer package
+makensis.exe %~dp0mpkg_win.nsi
+
 :MK_ERROR
 
 rem ; Cleanup