diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 547a5fecc5..80f3984f30 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-25 12:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/gtwvg/wvtutils.c
+    ! changed 'template' used as variable name to 'lpTemplate'
+      Some C++ compilers may not accept 'template' as variable name
+      because 'template' has special meaning in C++ so please do not
+      use such name - thanks to Andi
+
 2007-11-25 12:12 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbwmain.c
   * harbour/source/vm/mainwin.c
diff --git a/harbour/contrib/gtwvg/wvtutils.c b/harbour/contrib/gtwvg/wvtutils.c
index 37b145038b..bfd39ad1bc 100644
--- a/harbour/contrib/gtwvg/wvtutils.c
+++ b/harbour/contrib/gtwvg/wvtutils.c
@@ -1300,12 +1300,12 @@ HB_FUNC( WVT_CREATEDIALOGDYNAMIC )
          {
             case 0:
             {
-               LPTSTR template = HB_TCHAR_CONVTO( hb_parc( 1 ) );
+               LPTSTR lpTemplate = HB_TCHAR_CONVTO( hb_parc( 1 ) );
                hDlg = CreateDialog( ( HINSTANCE     ) hb_hInstance,
-                                                      template,
+                                                      lpTemplate,
                                                       hb_parl( 2 ) ? _s->hWnd : NULL,
                                                       (DLGPROC) hb_wvt_gtDlgProcMLess );
-               HB_TCHAR_FREE( template );
+               HB_TCHAR_FREE( lpTemplate );
             }
             break;
 
@@ -1424,13 +1424,13 @@ HB_FUNC( WVT_CREATEDIALOGMODAL )
    {
       case 0:
       {
-         LPTSTR template = HB_TCHAR_CONVTO( hb_parc( 1 ) );
+         LPTSTR lpTemplate = HB_TCHAR_CONVTO( hb_parc( 1 ) );
          iResult = DialogBoxParam( ( HINSTANCE     ) hb_hInstance,
-                                                     template,
+                                                     lpTemplate,
                                                      hParent,
                                                      (DLGPROC) hb_wvt_gtDlgProcModal,
                                 ( LPARAM ) ( DWORD ) iIndex+1 );
-         HB_TCHAR_FREE( template );
+         HB_TCHAR_FREE( lpTemplate );
       }
       break;