diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a7aefcbcd2..ac0c460938 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-20 08:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    ! Fixed to handle spaces in PATH elements.
+      Now '#' is used as intermediate char. Please change it to something
+      else if you feel this might clash with some real-world scenarios.
+
+  * utils/hbmk2/hbmk2.prg
+  * config/wce/msvcarm.mk
+    ! Readded -DUNDER_CE.
+      Does anyone know of any documentation about required macros
+      for WinCE compilation?
+
 2009-08-19 17:02 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbxbp/xbpbrowse.prg
     ! Horizontal scrolling made more perfect and Clipper like.
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index c91073e622..273e5ea91e 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -49,15 +49,17 @@ MAKE_381 := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
 
 # Don't indent this subroutine
 define find_in_path
-$(strip $(foreach dir,$(subst $(PTHSEP), ,$(PATH)),$(wildcard $(dir)/$(1)$(HB_HOST_BIN_EXT))))
+$(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),#,$(PATH))), $(wildcard $(subst #,\ ,$(subst \,/,$(dir)))/$(1)$(HB_HOST_BIN_EXT))))
 endef
 
+# Don't indent this subroutine
 define find_in_path_par
-$(strip $(foreach dir,$(subst $(PTHSEP), ,$(2)),$(wildcard $(dir)/$(1)$(HB_HOST_BIN_EXT))))
+$(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),#,$(2))), $(wildcard $(subst #,\ ,$(subst \,/,$(dir)))/$(1)$(HB_HOST_BIN_EXT))))
 endef
 
+# Don't indent this subroutine
 define find_in_path_raw
-$(strip $(foreach dir,$(subst $(PTHSEP), ,$(2)),$(wildcard $(dir)/$(1))))
+$(strip $(foreach dir, $(subst $(PTHSEP), ,$(subst $(subst x, ,x),#,$(2))), $(wildcard $(subst #,\ ,$(subst \,/,$(dir)))/$(1))))
 endef
 
 define check_host
diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk
index c34219c885..c22a03a180 100644
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -19,7 +19,7 @@ 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
+CFLAGS := -nologo -DWINCE -D_WINCE -D_WINDOWS -DARM -D_ARM_ -DARMV4 -D_M_ARM -D_UNICODE -D_UWIN -DUNDER_CE
 LDFLAGS :=
 
 ifeq ($(HB_BUILD_MODE),c)
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 925285d538..3c2f199b13 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2642,6 +2642,7 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             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_aOPTL ], "/subsystem:windowsce" )
             AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:oldnames.lib" )
             AAdd( hbmk[ _HBMK_aOPTL ], "/nodefaultlib:kernel32.lib" )