diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ae27e59437..95c1a00ef7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,27 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-09 20:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  - contrib/hbmysql/utils/bld_b32.bat
+  - contrib/hbmysql/utils/bld_vc.bat
+  + contrib/hbmysql/utils/hbmk_b32.bat
+  + contrib/hbmysql/utils/hbmk_vc.bat
+  - contrib/hbgd/tests/bld.sh
+  + contrib/hbgd/tests/hbmk_gnu.sh
+  * contrib/hbbtree/tests/hbmk_b32.bat
+  * contrib/hbbtree/tests/hbmk_vc.bat
+  * contrib/examples/pp/hbmk_b32.bat
+  * contrib/examples/pp/hbmk_vc.bat
+  * contrib/examples/guestbk/hbmk_b32.bat
+  * contrib/examples/guestbk/hbmk_vc.bat
+  * contrib/examples/pe/hbmk_b32.bat
+  * contrib/examples/pe/hbmk_vc.bat
+  * contrib/examples/hscript/hbmk_vc.bat
+    * Some remaining renames.
+    * Got rid of temp files in BCC batch files. Win9x is no longer 
+      supported.
+    * Some other minor cleanups.
+
 2008-11-09 20:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   - contrib/examples/dbu/bld_b32.bat
   - contrib/examples/dbu/bld_vc.bat
diff --git a/harbour/contrib/examples/guestbk/hbmk_b32.bat b/harbour/contrib/examples/guestbk/hbmk_b32.bat
index adcb6559ae..2013d1b073 100644
--- a/harbour/contrib/examples/guestbk/hbmk_b32.bat
+++ b/harbour/contrib/examples/guestbk/hbmk_b32.bat
@@ -5,28 +5,9 @@ rem
 
 ..\..\..\bin\harbour /n /i..\..\..\include\ guestbk inifiles testcgi
 
-echo -O2 -I..\..\..\include -L..\..\..\lib > build.tmp
-echo guestbk.c >> build.tmp
-echo inifiles.c >> build.tmp
-echo testcgi.c >> build.tmp
-echo hbdebug.lib >> build.tmp
-echo hbvm.lib >> build.tmp
-echo hbrtl.lib >> build.tmp
-echo gtwin.lib >> build.tmp
-echo hblang.lib >> build.tmp
-echo hbrdd.lib >> build.tmp
-echo hbmacro.lib >> build.tmp
-echo hbpp.lib >> build.tmp
-echo rddntx.lib >> build.tmp
-echo rddcdx.lib >> build.tmp
-echo rddfpt.lib >> build.tmp
-echo hbsix.lib >> build.tmp
-echo hbcommon.lib >> build.tmp
-bcc32 @build.tmp
-del build.tmp
+bcc32 -O2 -I..\..\..\include -L..\..\..\lib guestbk.c inifiles.c testcgi.c hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib
 
 del *.obj
-
 del guestbk.c inifiles.c testcgi.c
 
 guestbk
diff --git a/harbour/contrib/examples/guestbk/hbmk_vc.bat b/harbour/contrib/examples/guestbk/hbmk_vc.bat
index f32f6cc858..4b886a3a1a 100644
--- a/harbour/contrib/examples/guestbk/hbmk_vc.bat
+++ b/harbour/contrib/examples/guestbk/hbmk_vc.bat
@@ -5,7 +5,7 @@ rem
 
 ..\..\..\bin\harbour /n /i..\..\..\include\ guestbk inifiles testcgi
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include guestbk.c inifiles.c testcgi.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
+cl -nologo -O2 -W3 -I..\..\..\include guestbk.c inifiles.c testcgi.c /link /subsystem:console /libpath:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
 
 del *.obj
 del guestbk.c inifiles.c testcgi.c
diff --git a/harbour/contrib/examples/hscript/hbmk_vc.bat b/harbour/contrib/examples/hscript/hbmk_vc.bat
index 641043c768..2ec301c2d5 100644
--- a/harbour/contrib/examples/hscript/hbmk_vc.bat
+++ b/harbour/contrib/examples/hscript/hbmk_vc.bat
@@ -6,7 +6,7 @@ rem
 rem NOTE: This sample program needs hbnf.lib from contrib/hbnf
 
 ..\..\..\bin\harbour hscript /n /i..\..\..\include
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include hscript.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib hbnf.lib user32.lib winspool.lib
+cl -nologo -O2 -W3 -I..\..\..\include hscript.c /link /subsystem:console /libpath:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib hbnf.lib user32.lib winspool.lib
 del *.obj
 del hscript.c
 
diff --git a/harbour/contrib/examples/pe/hbmk_b32.bat b/harbour/contrib/examples/pe/hbmk_b32.bat
index d3a8788912..f4d87e5605 100644
--- a/harbour/contrib/examples/pe/hbmk_b32.bat
+++ b/harbour/contrib/examples/pe/hbmk_b32.bat
@@ -5,25 +5,7 @@ rem
 
 ..\..\..\bin\harbour /n /i..\..\..\include\ pe editorhi
 
-echo -O2 -I..\..\..\include -L..\..\..\lib > build.tmp
-echo pe.c >> build.tmp
-echo editorhi.c >> build.tmp
-echo editorlo.c >> build.tmp
-echo hbdebug.lib >> build.tmp
-echo hbvm.lib >> build.tmp
-echo hbrtl.lib >> build.tmp
-echo gtwin.lib >> build.tmp
-echo hblang.lib >> build.tmp
-echo hbrdd.lib >> build.tmp
-echo hbmacro.lib >> build.tmp
-echo hbpp.lib >> build.tmp
-echo rddntx.lib >> build.tmp
-echo rddcdx.lib >> build.tmp
-echo rddfpt.lib >> build.tmp
-echo hbsix.lib >> build.tmp
-echo hbcommon.lib >> build.tmp
-bcc32 @build.tmp
-del build.tmp
+bcc32 -O2 -I..\..\..\include -L..\..\..\lib pe.c editorhi.c editorlo.c hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib
 
 del *.obj
 del pe.c editorhi.c
diff --git a/harbour/contrib/examples/pe/hbmk_vc.bat b/harbour/contrib/examples/pe/hbmk_vc.bat
index 685789db62..eff00949db 100644
--- a/harbour/contrib/examples/pe/hbmk_vc.bat
+++ b/harbour/contrib/examples/pe/hbmk_vc.bat
@@ -5,7 +5,7 @@ rem
 
 ..\..\..\bin\harbour /n /i..\..\..\include\ pe editorhi
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include pe.c editorhi.c editorlo.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
+cl -nologo -O2 -W3 -I..\..\..\include pe.c editorhi.c editorlo.c /link /subsystem:console /libpath:..\..\..\lib hbcpage.lib hbdebug.lib hbvm.lib hbrtl.lib gtwin.lib hblang.lib hbrdd.lib hbmacro.lib hbpp.lib rddntx.lib rddcdx.lib rddfpt.lib hbsix.lib hbcommon.lib hbpcre.lib hbzlib.lib user32.lib winspool.lib
 
 del *.obj
 del pe.c editorhi.c
diff --git a/harbour/contrib/examples/pp/hbmk_b32.bat b/harbour/contrib/examples/pp/hbmk_b32.bat
index 3721db3ae3..fe51ac373c 100644
--- a/harbour/contrib/examples/pp/hbmk_b32.bat
+++ b/harbour/contrib/examples/pp/hbmk_b32.bat
@@ -3,11 +3,8 @@ rem
 rem $Id$
 rem
 
-echo -O2 -I..\..\..\include -L..\..\..\lib > build.tmp
-echo pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c >> build.tmp
-echo hbcommon.lib >> build.tmp
-bcc32 @build.tmp
-del build.tmp
+bcc32 -O2 -I..\..\..\include -L..\..\..\lib pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c hbcommon.lib
+
 del *.obj
 
 pp
diff --git a/harbour/contrib/examples/pp/hbmk_vc.bat b/harbour/contrib/examples/pp/hbmk_vc.bat
index c438dbbc4c..9a0d5d1f0d 100644
--- a/harbour/contrib/examples/pp/hbmk_vc.bat
+++ b/harbour/contrib/examples/pp/hbmk_vc.bat
@@ -3,7 +3,8 @@ rem
 rem $Id$
 rem
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c /link /subsystem:CONSOLE /LIBPATH:..\..\..\lib hbcommon.lib
+cl -nologo -O2 -W3 -I..\..\..\include pp.c hbppcomp.c hbppcore.c hbpptbl.c hbpragma.c /link /subsystem:console /libpath:..\..\..\lib hbcommon.lib
+
 del *.obj
 
 pp
diff --git a/harbour/contrib/hbbtree/tests/hbmk_b32.bat b/harbour/contrib/hbbtree/tests/hbmk_b32.bat
index c6bbed77fd..4fe674c939 100644
--- a/harbour/contrib/hbbtree/tests/hbmk_b32.bat
+++ b/harbour/contrib/hbbtree/tests/hbmk_b32.bat
@@ -5,22 +5,7 @@ rem
 
 ..\..\..\bin\harbour /w3 /q /n /km /i..\..\..\include test ttest
 
-echo -O2 -I..\..\..\include -L..\..\..\lib > build.tmp
-
-echo test.c       >> build.tmp
-echo ttest.c      >> build.tmp
-echo ctest.c      >> build.tmp
-echo hbvm.lib     >> build.tmp
-echo hbrtl.lib    >> build.tmp
-echo gtwin.lib    >> build.tmp
-echo hbnulrdd.lib >> build.tmp
-echo hbmacro.lib  >> build.tmp
-echo hbcommon.lib >> build.tmp
-echo hbbtree.lib  >> build.tmp
-echo hbct.lib     >> build.tmp
-
-bcc32 @build.tmp
-del build.tmp
+bcc32 -O2 -I..\..\..\include -L..\..\..\lib test.c ttest.c ctest.c hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib hbbtree.lib hbct.lib
 
 del *.obj
 del test.c ttest.c
diff --git a/harbour/contrib/hbbtree/tests/hbmk_vc.bat b/harbour/contrib/hbbtree/tests/hbmk_vc.bat
index 213b3cbcc7..9075fe8fd6 100644
--- a/harbour/contrib/hbbtree/tests/hbmk_vc.bat
+++ b/harbour/contrib/hbbtree/tests/hbmk_vc.bat
@@ -5,7 +5,7 @@ rem
 
 ..\..\..\bin\harbour /w3 /q /n /km /i..\..\..\include test ttest
 
-cl -D_CRT_SECURE_NO_DEPRECATE -nologo -O2 -W3 -I..\..\..\include test.c ttest.c ctest.c /link /subsystem:CONSOLE /LIBPATH:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib hbct.lib hbbtree.lib
+cl -nologo -O2 -W3 -I..\..\..\include test.c ttest.c ctest.c /link /subsystem:console /libpath:..\..\lib hbvm.lib hbrtl.lib gtwin.lib hbnulrdd.lib hbmacro.lib hbcommon.lib user32.lib hbct.lib hbbtree.lib
 
 del *.obj
 del test.c ttest.c
diff --git a/harbour/contrib/hbgd/tests/bld.sh b/harbour/contrib/hbgd/tests/hbmk_gnu.sh
similarity index 100%
rename from harbour/contrib/hbgd/tests/bld.sh
rename to harbour/contrib/hbgd/tests/hbmk_gnu.sh
diff --git a/harbour/contrib/hbmysql/utils/bld_b32.bat b/harbour/contrib/hbmysql/utils/hbmk_b32.bat
similarity index 100%
rename from harbour/contrib/hbmysql/utils/bld_b32.bat
rename to harbour/contrib/hbmysql/utils/hbmk_b32.bat
diff --git a/harbour/contrib/hbmysql/utils/bld_vc.bat b/harbour/contrib/hbmysql/utils/hbmk_vc.bat
similarity index 100%
rename from harbour/contrib/hbmysql/utils/bld_vc.bat
rename to harbour/contrib/hbmysql/utils/hbmk_vc.bat