diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f01654571a..6b09f7084e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-04-17 19:34 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * harbour/source/common/hbver.c
+     + Added Vista and 2003 Windows versions.
+     * Updated Cygwin/Mingw compiler names.
+
 2007-04-17 04:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbapi.h
   * harbour/source/vm/dynsym.c
diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c
index 4e78975a25..363716875c 100644
--- a/harbour/source/common/hbver.c
+++ b/harbour/source/common/hbver.c
@@ -221,7 +221,11 @@ char * hb_verPlatform( void )
 
             case VER_PLATFORM_WIN32_NT:
 
-               if( osVer.dwMajorVersion == 5 && osVer.dwMinorVersion == 1 )
+               if( osVer.dwMajorVersion == 6 )
+                  pszName = "Windows Vista";
+               else if( osVer.dwMajorVersion == 5 && osVer.dwMinorVersion >= 2 )
+                  pszName = "Windows 2003";
+               else if( osVer.dwMajorVersion == 5 && osVer.dwMinorVersion == 1 )
                   pszName = "Windows XP";
                else if( osVer.dwMajorVersion == 5 )
                   pszName = "Windows 2000";
@@ -450,9 +454,9 @@ char * hb_verCompiler( void )
    #if defined(__DJGPP__)
       pszName = "Delorie GNU C";
    #elif defined(__CYGWIN__)
-      pszName = "Cygnus Cygwin GNU C";
+      pszName = "Cygwin GNU C";
    #elif defined(__MINGW32__)
-      pszName = "Cygnus MinGW GNU C";
+      pszName = "MinGW GNU C";
    #elif defined(__RSX32__)
       pszName = "EMX/RSXNT/DOS GNU C";
    #elif defined(__RSXNT__)