diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 863f6554c4..50566382bf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,25 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-07-29 22:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * package/winuni/RELNOTES
+    ! adjusted hbmk2 cmdline example for building wce apps
+      (it gets around the problem fixed in hbmk2 below)
+      [TOMERGE 3.0]
+
+  * utils/hbmk2/hbmk2.prg
+    ! fixed to only look for ccprefix/ccpostfix-ed gcc executable
+      on wce, if ccprefix/ccpostfix is non-empty. This fixes misdetection
+      of cygwin when -plat=wce is used.
+
+  * contrib/hbnf/menutonf.prg
+    ! FT_MenuTo() fixed to default 3rd parameter if non-logical type
+      is passed. this is original NFLIB bug. Spotted and fix siggested
+      by Klas Engwall.
+
+  * ChangeLog
+    + added TOMERGE to previous entry
+
 2011-07-28 13:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/compiler/cmdcheck.c
     ! added workaround for what it seems like a clang bug in latest Apple XCode 4.1
@@ -29,6 +48,7 @@
       The fix simply introduces a new variable to use ptr reference instead of
       indexed vector access in one specific loop.
       Please review/refix it, I didn't make functional tests.
+      [TOMERGE 3.0]
 
 2011-07-28 00:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/vm/hvm.c
diff --git a/harbour/contrib/hbnf/menutonf.prg b/harbour/contrib/hbnf/menutonf.prg
index c946ac594b..1790464621 100644
--- a/harbour/contrib/hbnf/menutonf.prg
+++ b/harbour/contrib/hbnf/menutonf.prg
@@ -160,6 +160,10 @@ local lChoice := .F.
 local nCursor := set( _SET_CURSOR,SC_NONE )
 local nKey,bKey,nScan,lWrap,cScreen,nPrev
 
+IF ! hb_isLogical( lCold )
+   lCold := .F.
+ENDIF
+
 // Validate the incoming parameters and assign some reasonable defaults
 // to prevent a crash later.
 
diff --git a/harbour/package/winuni/RELNOTES b/harbour/package/winuni/RELNOTES
index 6d7f41e5ae..541b36c150 100644
--- a/harbour/package/winuni/RELNOTES
+++ b/harbour/package/winuni/RELNOTES
@@ -1,6 +1,6 @@
 Hi All,
 
-Harbour 3.0.0 (r?????) source archives and Windows binary
+Harbour 3.0.0 (r16951) source archives and Windows binary
 releases are available for download on sourceforge.net:
 
    http://sourceforge.net/projects/harbour-project/files/
@@ -29,7 +29,7 @@ Usage:
 3) For x86 executable, type: 'hbmk2 ../tests/hello.prg'
 4) For x64 executable, type: 'hbmk2 ../tests/hello.prg -compiler=mingw64'
    [needs mingw64 to be installed in 'comp/mingw64' dir beforehand]
-5) For WinCE/ARM executable, type: 'hbmk2 ../tests/hello.prg -platform=wce'
+5) For WinCE/ARM executable, type: 'hbmk2 ../tests/hello.prg -compiler=mingwarm'
    [needs cegcc to be installed in 'comp/mingwarm' dir beforehand]
 
 Tool/lib versions used to create this package:
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 653803c370..9d10479c50 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1452,7 +1452,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                     { {|| FindInPath( "arm-mingw32ce-gcc"       ) }, "mingwarm", "arm-mingw32ce-" } ,;
                     { {|| FindInPath( "arm-wince-mingw32ce-gcc" ) }, "mingwarm", "arm-wince-mingw32ce-" } ,;
                     { {|| FindInPath( "i386-mingw32ce-gcc"      ) }, "mingw"   , "i386-mingw32ce-" } ,;
-                    { {|| FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ) }, "mingwarm" } }
+                    { {|| iif( ! Empty( hbmk[ _HBMK_cCCPREFIX ] ) .OR. ! Empty( hbmk[ _HBMK_cCCPOSTFIX ] ),;
+                          FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "gcc" + hbmk[ _HBMK_cCCPOSTFIX ] ),;
+                          NIL ) }, "mingwarm" } }
 #endif
       aCOMPSUP := { "mingwarm", "msvcarm", "poccarm" }
       l_aLIBHBGT := { "gtwvt", "gtgui" }