diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e8d8dff0f9..87ba6ad5be 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-24 01:41 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbwhat/tests/whatdemo.prg
+    ! SVN ID.
+
+  + contrib/hbwhat/tests/bld_b32.bat
+  + contrib/hbwhat/tests/bld_vc.bat
+    + Added missing non-GNU make files.
+
 2008-09-24 01:37 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * source/rtl/gtsys.c
     * Added HB_WINCE with GTWVT to the set of defaults.
diff --git a/harbour/contrib/hbwhat/tests/bld_b32.bat b/harbour/contrib/hbwhat/tests/bld_b32.bat
new file mode 100644
index 0000000000..fb9fb01505
--- /dev/null
+++ b/harbour/contrib/hbwhat/tests/bld_b32.bat
@@ -0,0 +1,15 @@
+@echo off
+rem
+rem $Id$
+rem
+
+if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin
+if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib
+if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
+
+set HB_ARCHITECTURE=w32
+set HB_COMPILER=bcc32
+set HB_USER_LIBS=hbwhat.lib gtwvg.lib xhb.lib
+set C_USR=-tW
+
+call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbwhat/tests/bld_vc.bat b/harbour/contrib/hbwhat/tests/bld_vc.bat
new file mode 100644
index 0000000000..2df26670f9
--- /dev/null
+++ b/harbour/contrib/hbwhat/tests/bld_vc.bat
@@ -0,0 +1,14 @@
+@echo off
+rem
+rem $Id$
+rem
+
+if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=..\..\..\bin
+if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=..\..\..\lib
+if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\..\..\include
+
+set HB_ARCHITECTURE=w32
+set HB_COMPILER=msvc
+set HB_USER_LIBS=hbwhat.lib gtwvg.lib xhb.lib comdlg32.lib comctl32.lib shell32.lib ole32.lib oleaut32.lib
+
+call %HB_BIN_INSTALL%\bld.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbwhat/tests/whatdemo.prg b/harbour/contrib/hbwhat/tests/whatdemo.prg
index bc844513c1..ce7291b547 100644
--- a/harbour/contrib/hbwhat/tests/whatdemo.prg
+++ b/harbour/contrib/hbwhat/tests/whatdemo.prg
@@ -1,3 +1,7 @@
+/*
+ * $Id$
+ */
+
 //----------------------------------------------------------------------//
 //
 //                               WhatDemo.prg
@@ -6,18 +10,18 @@
 //
 //----------------------------------------------------------------------//
 
-#Include "inkey.ch"
-#Include "winuser.ch"
+#include "inkey.ch"
+#include "winuser.ch"
 
 //----------------------------------------------------------------------//
 
 Function Main()
    Local nKey
 
-   SetColor( 'N/W' )
+   SetColor( "N/W" )
    CLS
 
-   DispOutAt( Maxrow(),0, padc( 'F2 New Dialog    ESC Exit', maxcol()+1 ), 'W+/R' )
+   DispOutAt( Maxrow(),0, padc( "F2 New Dialog    ESC Exit", maxcol()+1 ), "W+/R" )
 
    do while .t.
       nKey := inkey()
@@ -114,4 +118,3 @@ Function MyDlgProc2( hDlg, nMsg, nwParam, nlParam )
    Return( 0 )
 
 //----------------------------------------------------------------------//
-