diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index daf7ba3f7b411e86851a1ce690f0f8dba04608a5..27b4af7a6ecec3e702b112d2f19bd37cd0fc532f 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -2980,15 +2980,22 @@ bool SystemInformationImplementation::QueryOSInformation()
         {
         if (osvi.wProductType == VER_NT_WORKSTATION) 
           {
-// VER_SUITE_PERSONAL may not be defined
-#ifdef VER_SUITE_PERSONAL
-          if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
+          if (osvi.dwMajorVersion == 6) 
             {
-            this->OSRelease += " Personal";
+            this->OSRelease = "Vista";
             }
-          else 
+// VER_SUITE_PERSONAL may not be defined
+#ifdef VER_SUITE_PERSONAL
+          else
             {
-            this->OSRelease += " Professional";
+            if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
+              {
+              this->OSRelease += " Personal";
+              }
+            else 
+              {
+              this->OSRelease += " Professional";
+              }
             }
 #endif
           } 
@@ -3015,7 +3022,7 @@ bool SystemInformationImplementation::QueryOSInformation()
             }
           }
 
-        sprintf (operatingSystem, "%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
+        sprintf (operatingSystem, "%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
         this->OSVersion = operatingSystem; 
         }
       else 
@@ -3095,7 +3102,7 @@ bool SystemInformationImplementation::QueryOSInformation()
       else 
         { 
         // Windows 2000 and everything else.
-        sprintf (operatingSystem,"%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
+        sprintf (operatingSystem,"%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
         this->OSVersion = operatingSystem;
         }
       break;
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 9de31890cb0170bf1c10a9c8c5ebcb247905e92b..e443d26e79356ed86694d9413f30c2858a14882e 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4182,7 +4182,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
           res += "Microsoft Windows Server 2008 family";
           }
 #else
-        res += "Microsoft Windows Vista or Windows Server 2003";
+        res += "Microsoft Windows Vista or Windows Server 2008";
 #endif
         }