diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ea9b840f27..3047d3148f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-09 22:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/make_xmingwce.sh
+    ! fixed HB_PPGEN_PATH setting
+
 2008-07-09 18:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/filesys.c
     ! casting
diff --git a/harbour/make_xmingwce.sh b/harbour/make_xmingwce.sh
index 3ad4b31aba..9e9a835005 100755
--- a/harbour/make_xmingwce.sh
+++ b/harbour/make_xmingwce.sh
@@ -103,8 +103,14 @@ if [ -z "${HB_PPGEN_PATH}" ]; then
         fi
     fi
 fi
-if [ -x "${HB_PPGEN_PATH}" ]; then
+if [ -d "${HB_PPGEN_PATH}" ]; then
+   if [ -x "${HB_PPGEN_PATH}/hbpp" ]; then
+      HB_PPGEN_PATH="${HB_PPGEN_PATH}/hbpp"
+   fi
+fi
+if [ -x "${HB_PPGEN_PATH}" ] && [ -f "${HB_PPGEN_PATH}" ]; then
     ln -s ${HB_PPGEN_PATH} ${HB_BIN_COMPILE}/hbpp.exe
+    HB_PPGEN_PATH="${HB_BIN_COMPILE}"
 else
     echo "You must have a working 'hbpp' executable for your platform on your PATH."
     exit 1