diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f8ff5f131a..a61f4a96bb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-20 11:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+  * config/wce/msvcarm.mk
+    ! Fixes to cmdline macros, now many warnings are gone.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added ceshell, oleaut32 syslibs to default wce liblist.
+      (to be more in sync with win)
+
+  * contrib/hbwin/hbwin.hbc
+    ! Added sms syslib for wce.
+
 2009-08-20 10:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
     + Don't attempt to install includes and docs if HB_INSTALL_PREFIX
diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk
index c22a03a180..5c55b71add 100644
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -19,7 +19,8 @@ CC_IN := -c
 CC_OUT := -Fo
 
 CPPFLAGS := -I. -I$(HB_INC_COMPILE)
-CFLAGS := -nologo -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_UNICODE -D_UWIN -DUNDER_CE
+CFLAGS := -nologo -D_WIN32_WCE=0x501 -DCE_ARCH -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_ARMV4I_ -Darmv4i -D__arm__ -D_UNICODE -D_UWIN -DUNDER_CE
+
 LDFLAGS :=
 
 ifeq ($(HB_BUILD_MODE),c)
diff --git a/harbour/contrib/hbwin/hbwin.hbc b/harbour/contrib/hbwin/hbwin.hbc
index 99a3889871..d686b2b524 100644
--- a/harbour/contrib/hbwin/hbwin.hbc
+++ b/harbour/contrib/hbwin/hbwin.hbc
@@ -7,3 +7,4 @@
 incpaths=.
 
 libs=hbwin
+{wce}libs=sms
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 1d1f1063dc..048d268ade 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -938,7 +938,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
       cBinExt := ".exe"
       cOptPrefix := "-/"
       l_aLIBSYSCORE := { "coredll", "ws2" }
-      l_aLIBSYSMISC := { "uuid", "ole32", "wininet", "commdlg", "commctrl" }
+      l_aLIBSYSMISC := { "ceshell", "uuid", "ole32", "oleaut32", "wininet", "commdlg", "commctrl" }
+
    OTHERWISE
       hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Architecture value unknown: %1$s" ), hbmk[ _HBMK_cARCH ] ) )
       RETURN 1
@@ -2633,18 +2634,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             AAdd( hbmk[ _HBMK_aOPTD ], "/map" )
          ENDIF
          IF hbmk[ _HBMK_cCOMP ] == "msvcarm"
-            /* NOTE: Copied from .mk. Probably needs cleaning. */
-            AAdd( hbmk[ _HBMK_aOPTC ], "-DWINCE" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-D_WINCE" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-D_WINDOWS" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-DARM" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-D_ARM_" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-DARMV4" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-D_M_ARM" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-DUNICODE" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-D_UNICODE" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-D_UWIN" )
-            AAdd( hbmk[ _HBMK_aOPTC ], "-DUNDER_CE" )
+            AAdd( hbmk[ _HBMK_aOPTC ], "-D_WIN32_WCE=0x501 -DCE_ARCH -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_ARMV4I_ -Darmv4i -D__arm__ -D_UNICODE -D_UWIN -DUNDER_CE" )
             AAdd( hbmk[ _HBMK_aOPTL ], "/subsystem:windowsce" )
             AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:oldnames.lib" )
             AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:kernel32.lib" )