diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 63b2377b73..eb0523debc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-19 20:35 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * contrib/examples/dbu/bld_b32.bat
+     * Now the non-GNU build batch file will look for 
+       DBU source in the original CA-Cl*pper installation, 
+       if specified (using 'set CLIPPER_DIR=C:\CLIPPER5\').
+
 2007-11-19 20:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    + contrib/rdd_ads/test
    + contrib/rdd_ads/test/testmg.prg
diff --git a/harbour/contrib/examples/dbu/bld_b32.bat b/harbour/contrib/examples/dbu/bld_b32.bat
index 18710ce05c..ab242f2e91 100644
--- a/harbour/contrib/examples/dbu/bld_b32.bat
+++ b/harbour/contrib/examples/dbu/bld_b32.bat
@@ -3,15 +3,34 @@ rem
 rem $Id$
 rem
 
-..\..\..\bin\harbour /n dbu.prg     /i..\..\..\include\
-..\..\..\bin\harbour /n dbucopy.prg /i..\..\..\include\
-..\..\..\bin\harbour /n dbuedit.prg /i..\..\..\include\
-..\..\..\bin\harbour /n dbuhelp.prg /i..\..\..\include\
-..\..\..\bin\harbour /n dbuindx.prg /i..\..\..\include\
-..\..\..\bin\harbour /n dbunet.prg  /i..\..\..\include\
-..\..\..\bin\harbour /n dbustru.prg /i..\..\..\include\
-..\..\..\bin\harbour /n dbuutil.prg /i..\..\..\include\
-..\..\..\bin\harbour /n dbuview.prg /i..\..\..\include\
+set DBU_DIR=%CLIPPER_DIR%\SOURCE\DBU
+if exist "%DBU_DIR%\DBU.PRG" goto BUILD
+set DBU_DIR=.
+if exist "%DBU_DIR%\DBU.PRG" goto BUILD
+
+:HELP
+
+echo ---------------------------------------------------------------
+echo IMPORTANT: You'll either need to copy the original CA-Cl*pper 
+echo            DBU sources to this directory, or set the location of 
+echo            your original CA-Cl*pper installation (with DBU sources 
+echo            in SOURCE\DBU):
+echo            set CLIPPER_DIR=C:\CLIPPER5
+echo ---------------------------------------------------------------
+
+goto EXIT
+
+:BUILD
+
+..\..\..\bin\harbour /n %DBU_DIR%\DBU.PRG     /i..\..\..\include\
+..\..\..\bin\harbour /n %DBU_DIR%\DBUCOPY.PRG /i..\..\..\include\
+..\..\..\bin\harbour /n %DBU_DIR%\DBUEDIT.PRG /i..\..\..\include\
+..\..\..\bin\harbour /n %DBU_DIR%\DBUHELP.PRG /i..\..\..\include\
+..\..\..\bin\harbour /n %DBU_DIR%\DBUINDX.PRG /i..\..\..\include\
+..\..\..\bin\harbour /n %DBU_DIR%\DBUNET.PRG  /i..\..\..\include\
+..\..\..\bin\harbour /n %DBU_DIR%\DBUSTRU.PRG /i..\..\..\include\
+..\..\..\bin\harbour /n %DBU_DIR%\DBUUTIL.PRG /i..\..\..\include\
+..\..\..\bin\harbour /n %DBU_DIR%\DBUVIEW.PRG /i..\..\..\include\
 
 echo -O2 -I..\..\..\include -L..\..\..\lib > build.tmp
 echo -edbu.exe >> build.tmp
@@ -41,3 +60,5 @@ bcc32 @build.tmp
 del build.tmp
 
 dbu
+
+:EXIT