diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d4d68e1eed..35d711e5f2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+19990607-12:50 CET Eddie Runia
+  * makefile.b32, build32.bat
+    changed to split the terminal driver into seperate makefile for Windows
+    support
+  + terminal.b32
+    split terminal driver
+  * tests/working/bld32w.bat
+    windows build file uses echo now
+
 19990607-03:05 PST Ron Pinkas
   * include/hberrors.h
     added WARN_VAR_NOT_USED
diff --git a/harbour/build32.bat b/harbour/build32.bat
index 25bc53a989..50bf340ea1 100644
--- a/harbour/build32.bat
+++ b/harbour/build32.bat
@@ -1,6 +1,7 @@
 @echo off
 del build32.err
 make -fmakefile.b32 > build32.err
+make -fterminal.b32 >> build32.err
 call bldgt32.bat >> build32.err
 cd tests\working
 call bld32exe.bat runner >> build32.err
diff --git a/harbour/makefile.b32 b/harbour/makefile.b32
index 7534e10d99..4de6fe47e4 100644
--- a/harbour/makefile.b32
+++ b/harbour/makefile.b32
@@ -21,20 +21,6 @@ harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj \
               symbols.obj strings.obj stringp.obj \
               stringsx.obj strcmp.obj tclass.obj transfrm.obj
 
-libs\b32\terminal.lib : console.obj gtapi.obj gtdos.obj
-
-libs\win32\terminal.lib : console.obj gtapi.obj gtwin.obj
-
-console.obj  : console.c  extend.h types.h
-gtapi.obj    : gtapi.c    extend.h types.h
-gtdos.obj    : gtdos.c    extend.h types.h
-gtwin.obj    : gtwin.c    extend.h types.h
-  bcc32 -c -O2 -I.\include -o$@ source\rtl\console.c source\rtl\gtapi.c source\rtl\gt\gtdos.c
-  tlib .\libs\b32\terminal.lib -+$@,,
-  bcc32 -c -O2 -DWINDOWS -I.\include -o$@ source\rtl\console.c source\rtl\gtapi.c source\rtl\gt\gtwin.c
-  tlib .\libs\win32\terminal.lib -+$@,,
-
-
 symbols.obj  : symbols.asm
 
 arrays.obj   : arrays.c   extend.h types.h
@@ -45,15 +31,16 @@ dates.obj    : dates.c    extend.h types.h
 datesx.obj   : datesx.c   extend.h types.h
 debug.obj    : debug.c    extend.h types.h
 descend.obj  : descend.c  extend.h types.h
-dir.obj      : extend.c   extend.h types.h
+dir.obj      : dir.c      extend.h types.h
 dynsym.obj   : dynsym.c   extend.h types.h
 environ.obj  : environ.c  extend.h types.h
 error.obj    : error.c    extend.h types.h
 errorapi.obj : errorapi.c extend.h types.h
 errorsys.obj : errorsys.c extend.h types.h
 extend.obj   : extend.c   extend.h types.h
-files.obj    : extend.c   extend.h types.h
+files.obj    : files.c    extend.h types.h
 hardcr.obj   : hardcr.c   extend.h types.h
+hb_f.obj     : hb.c       extend.h types.h
 initsymb.obj : initsymb.c extend.h types.h
 itemapi.obj  : itemapi.c  extend.h types.h
 math.obj     : math.c     extend.h types.h
@@ -68,7 +55,6 @@ strings.obj  : strings.c  extend.h types.h
 stringsx.obj : stringsx.c extend.h types.h
 tclass.obj   : tclass.c   extend.h types.h
 transfrm.obj : transfrm.c extend.h types.h
-hb_f.obj     : hb_f.c     extend.h types.h
 
 asort.c      : asort.prg     harbour.exe
 error.c      : error.prg     harbour.exe
diff --git a/harbour/terminal.b32 b/harbour/terminal.b32
new file mode 100644
index 0000000000..f18b74e2c3
--- /dev/null
+++ b/harbour/terminal.b32
@@ -0,0 +1,23 @@
+# makefile for Borland C/C++ 32 bits
+# terminal makefile
+
+.path.c   = source\rtl;source\rtl\gt
+.path.h   = include
+.path.lib = libs\win32
+.path.obj = obj
+
+libs\b32\terminal.lib : console.obj gtapi.obj gtdos.obj
+
+libs\win32\terminal.lib : console.obj gtapi.obj gtwin.obj
+
+console.obj  : console.c  extend.h types.h
+gtapi.obj    : gtapi.c    extend.h types.h
+gtdos.obj    : gtdos.c    extend.h types.h
+gtwin.obj    : gtwin.c    extend.h types.h
+
+.c.obj:
+  bcc32 -wmsg -c -O2 -I.\include -o$@ $<
+  tlib .\libs\b32\terminal.lib -+$@,,
+  del obj\console.obj
+  bcc32 -wmsg -c -O2 -DWINDOWS -I.\include -o$@ $<
+  tlib .\libs\win32\terminal.lib -+$@,,
diff --git a/harbour/tests/working/bld32w.bat b/harbour/tests/working/bld32w.bat
index fdf87a5aaa..d92a3697c9 100644
--- a/harbour/tests/working/bld32w.bat
+++ b/harbour/tests/working/bld32w.bat
@@ -3,11 +3,17 @@
 IF A%1 == A GOTO :SINTAX
 IF A%2 == A GOTO :NOOUTPUT
 
-bcc32 -O2 -e%2.exe -DWINDOWS -tW -I..\..\include ..\..\source\vm\hvm.c %1.c ..\..\libs\b32\harbour.lib ..\..\libs\win32\terminal.lib
+echo -O2 -e%2.exe -DWINDOWS -tW -I..\..\include > b32.bc
+echo ..\..\source\vm\hvm.c %1.c ..\..\libs\b32\harbour.lib  ..\..\libs\win32\terminal.lib >> b32.bc
+bcc32 @b32.bc
+del b32.bc
 GOTO :END
 
 :NOOUTPUT
-bcc32 -O2 -e%1.exe -DWINDOWS -tW -I..\..\include ..\..\source\vm\hvm.c %1.c ..\..\libs\b32\harbour.lib ..\..\libs\win32\terminal.lib
+echo -O2 -e%1.exe -DWINDOWS -tW -I..\..\include > b32.bc
+echo ..\..\source\vm\hvm.c %1.c ..\..\libs\b32\harbour.lib  ..\..\libs\win32\terminal.lib >> b32.bc
+bcc32 @b32.bc
+del b32.bc
 GOTO :END
 
 :SINTAX