diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9801f7386d..b8051f49d8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,11 @@
+20000214-03:50 GMT+1 Victor Szakats <info@szelvesz.hu>
+   * bin/bld_b*.bat
+     bin/bld_vc.bat
+     + Made in sync with each other updated the lib file lists.
+   * makefile.bc
+     ! Changed hbpp.lib to pp.lib (again)
+     ! Fixed NULSYS.LIB generation bug.
+
 20000214-03:21 GMT+1 Victor Szakats <info@szelvesz.hu>
    * *.bat
      + Added CLEAN command to batch files.
diff --git a/harbour/bin/bld_b16.bat b/harbour/bin/bld_b16.bat
index 6083e968f2..4441675f97 100644
--- a/harbour/bin/bld_b16.bat
+++ b/harbour/bin/bld_b16.bat
@@ -3,6 +3,20 @@ rem
 rem $Id$
 rem
 
-..\bin\harbour %1 /n /i..\include
-bcc %1.c -e%1.exe -O2 -I..\include -L..\lib\b16 -P -mh -Fm harbour.lib terminal.lib hbpp.lib common.lib hbtools.lib
+..\bin\harbour %1 %2 %3 /n /i..\include
+echo -O2 -I..\include -mh -L..\lib\b16 > build.tmp
+echo %1.c >> build.tmp
+echo harbour.lib >> build.tmp
+echo pp.lib >> build.tmp
+echo common.lib >> build.tmp
+echo terminal.lib >> build.tmp
+echo macro.lib >> build.tmp
+echo tools.lib >> build.tmp
+echo dbfntx.lib >> build.tmp
+echo dbfcdx.lib >> build.tmp
+echo debug.lib >> build.tmp
+echo runner.lib >> build.tmp
+bcc @build.tmp
+del build.tmp
 del %1.c
+
diff --git a/harbour/bin/bld_b32.bat b/harbour/bin/bld_b32.bat
index f0202b91c5..c97f006f31 100644
--- a/harbour/bin/bld_b32.bat
+++ b/harbour/bin/bld_b32.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem
 
-..\bin\harbour %1 %2 /n /i..\include
-bcc32 -e%1.exe -O2 -I..\include -L..\lib\b32 -v harbour.lib terminal.lib hbpp.lib common.lib debug.lib dbfntx.lib macro.lib %1.c
+..\bin\harbour %1 %2 %3 /n /i..\include
+bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -v common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib runner.lib terminal.lib tools.lib
 rem del %1.c
diff --git a/harbour/bin/bld_b32o.bat b/harbour/bin/bld_b32o.bat
index 4d055775e3..8a239a6fb1 100644
--- a/harbour/bin/bld_b32o.bat
+++ b/harbour/bin/bld_b32o.bat
@@ -3,7 +3,7 @@ rem
 rem $Id$
 rem
 
-..\bin\harbour %1 /n /i..\include /gf
-tlink32 -L..\lib\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib common.lib import32.lib cw32mt.lib
+..\bin\harbour %1 %2 %3 /n /i..\include /gf
+tlink32 -L..\lib\b32 c0x32.obj %1.obj hvm.obj,%1.exe,, common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib runner.lib terminal.lib tools.lib import32.lib cw32mt.lib
 del %1.obj
 
diff --git a/harbour/bin/bld_b32w.bat b/harbour/bin/bld_b32w.bat
index b06b9f567b..3405690d18 100644
--- a/harbour/bin/bld_b32w.bat
+++ b/harbour/bin/bld_b32w.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem
 
-..\bin\harbour %1 %2 /n /i..\include
-bcc32 -e%1.exe -O2 -I..\include -L..\lib\b32 -v -tW harbour.lib terminal.lib hbpp.lib hbgt.lib common.lib rdd.lib %1.c
+..\bin\harbour %1 %2 %3 /n /i..\include
+bcc32 %1.c -e%1.exe -O2 -I..\include -L..\lib\b32 -v -tW common.lib dbfcdx.lib dbfntx.lib debug.lib harbour.lib pp.lib macro.lib runner.lib terminal.lib tools.lib
 rem del %1.c
diff --git a/harbour/bin/bld_vc.bat b/harbour/bin/bld_vc.bat
index 72d3749c79..9bbd69816c 100644
--- a/harbour/bin/bld_vc.bat
+++ b/harbour/bin/bld_vc.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem
 
-..\bin\harbour %1 /n /i..\include
-cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\vc\harbour.lib ..\lib\vc\terminal.lib ..\lib\vc\hbtools.lib ..\lib\vc\dbfntx.lib ..\lib\vc\dbfcdx.lib ..\lib\vc\debug.lib ..\lib\vc\macro.lib
+..\bin\harbour %1 %2 %3 /n /i..\include
+cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\vc\harbour.lib ..\lib\vc\pp.lib ..\lib\vc\terminal.lib ..\lib\vc\tools.lib ..\lib\vc\dbfntx.lib ..\lib\vc\dbfcdx.lib ..\lib\vc\debug.lib ..\lib\vc\macro.lib ..\lib\vc\common.lib
 del %1.c
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index c86ee31cfa..53ab39a020 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -55,7 +55,7 @@ COMMON_LIB_OBJS   = $(OBJ_DIR)\hbfsapi.obj \
                     $(OBJ_DIR)\reserved.obj \
                     $(OBJ_DIR)\hbtrace.obj
 
-PP_LIB            = $(LIB_DIR)\hbpp.lib
+PP_LIB            = $(LIB_DIR)\pp.lib
 PP_LIB_OBJS       = $(OBJ_DIR)\hbppint.obj \
                     $(OBJ_DIR)\hbpp.obj \
                     $(OBJ_DIR)\table.obj \
@@ -1193,7 +1193,7 @@ $(OBJ_DIR)\nulsys.c : $(RDD_DIR)\nulsys\nulsys.prg
 
 $(OBJ_DIR)\nulsys.obj : $(OBJ_DIR)\nulsys.c
    $(BCC_EXE) $(BCC_OPT) -c -I$(INCLUDE_DIR) -o$@ $**
-   tlib $(DBFNTX_LIB) -+$@,,
+   tlib $(NULSYS_LIB) -+$@,,
 
 #
 # dbfntx.lib