diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 23e4fbc878..77ce37c1e5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-14 21:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/pp/Makefile
+    ! fixed / used as directory separator in $(RM) command with non *nix like
+      shells
+    * restored wildcard hack for some dynamic shortcut redirectors, f.e.
+      DOSEMU
+
 2009-06-14 20:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbwin/Makefile
   - contrib/hbwin/legacyc.c
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index a25bf48fcd..ea29c20e4f 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -24,7 +24,6 @@ include $(TOP)$(ROOT)config/lib.cf
 
 INSTALL_RULE_LIBRARIES := $(INSTALL_RULE)
 
-# TOFIX: Convert to backslash *when* needed.
 HB_VERHEADER=$(TOP)$(ROOT)include/hbverbld.h
 
 ifeq ($(HB_CHANGELOG),)
@@ -33,6 +32,12 @@ ifeq ($(HB_CHANGELOG),)
    HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange[Ll]o)
 ifeq ($(HB_CHANGELOG),)
    HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange~1)
+ifeq ($(HB_CHANGELOG),)
+   HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange~?)
+ifeq ($(HB_CHANGELOG),)
+   HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hang~??)
+endif
+endif
 endif
 endif
 endif
@@ -56,4 +61,4 @@ install::
 	$(INSTALL_RULE_LIBRARIES)
 
 clean::
-	-$(RM) $(HB_VERHEADER)
+	-$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER))