diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5b237979b3..442179d2b8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,15 @@
+20000423-14:35 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   * source/pp/Makefile
+   - source/pp/stdalone/Makefile
+   - source/pp/stdalone/hbpp.c
+   + utils/hbpp/Makefile
+   + utils/hbpp/hbpp.c
+   * utils/Makefile
+   * makefile.bc
+   * makefile.vc (not tested)
+     * HBPP.EXE source files moved to utils/hbpp from source/pp/stdalone/
+
 20000423-14:23 GMT+1 Victor Szakats <info@szelvesz.hu>
 
    * source/rtl/alert.prg
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index e5f624cebd..ef94b2c02b 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -75,6 +75,7 @@ VM_DIR       = source\vm
 HBRUN_DIR    = utils\hbrun
 HBTEST_DIR   = utils\hbtest
 HBDOC_DIR    = utils\hbdoc
+HBPP_DIR     = utils\hbpp
 
 #
 # C compiler definition and C flags. These should never have to change.
@@ -1757,11 +1758,11 @@ $(OBJ_DIR)\mousewin.obj : $(RTL_DIR)\gtwin\mousewin.c
 # HBPP.EXE dependencies
 #
 $(HBPP_EXE) : \
-   $(PP_DIR)\stdalone\hbpp.c \
+   $(HBPP_DIR)\hbpp.c \
    $(PP_LIB_OBJS) \
    $(COMMON_LIB_OBJS)
 
-   $(CC) $(CLIBFLAGS) -o$(OBJ_DIR)\hbpp.obj $(PP_DIR)\stdalone\hbpp.c
+   $(CC) $(CLIBFLAGS) -o$(OBJ_DIR)\hbpp.obj $(HBPP_DIR)\hbpp.c
    echo. $(CFLAGS) > make.tmp
    echo. -e$(HBPP_EXE) >> make.tmp
    echo. -I$(INCLUDE_DIR) >> make.tmp
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index fc99f7bf63..aa406e9074 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -73,6 +73,7 @@ VM_DIR       = source\vm
 HBRUN_DIR    = utils\hbrun
 HBTEST_DIR   = utils\hbtest
 HBDOC_DIR    = utils\hbdoc
+HBPP_DIR     = utils\hbpp
 
 #
 # C compiler definition and C flags. These should never have to change.
@@ -624,7 +625,7 @@ all: \
 !endif
 
 $(HBPP_EXE) : \
-   $(PP_DIR)\stdalone\hbpp.c
+   $(HBPP_DIR)\hbpp.c
    $(CC) $(CFLAGS) -Fo$(OBJ_DIR)\ $** -o $(HBPP_EXE) /link $(LDFLAGS) $(PP_LIB) $(COMMON_LIB)
 
 #
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index 5ab6d5be31..7782ef3bf6 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -12,8 +12,4 @@ C_SOURCES=\
 
 LIBNAME=pp
 
-DIRS=\
-	stdalone \
-
 include $(TOP)$(ROOT)config/lib.cf
-include $(TOP)$(ROOT)config/dir.cf
diff --git a/harbour/utils/Makefile b/harbour/utils/Makefile
index e808c30dae..684c15376e 100644
--- a/harbour/utils/Makefile
+++ b/harbour/utils/Makefile
@@ -7,6 +7,7 @@ ROOT = ../
 DIRS=\
 	hbrun \
 	hbdoc \
+	hbpp \
 	hbtest \
 #	hbextern \
 
diff --git a/harbour/source/pp/stdalone/Makefile b/harbour/utils/hbpp/Makefile
similarity index 85%
rename from harbour/source/pp/stdalone/Makefile
rename to harbour/utils/hbpp/Makefile
index a9c71d0f89..779f1e7ada 100644
--- a/harbour/source/pp/stdalone/Makefile
+++ b/harbour/utils/hbpp/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../../
+ROOT = ../../
 
 C_SOURCES=\
 
diff --git a/harbour/source/pp/stdalone/hbpp.c b/harbour/utils/hbpp/hbpp.c
similarity index 100%
rename from harbour/source/pp/stdalone/hbpp.c
rename to harbour/utils/hbpp/hbpp.c