diff --git a/checkin_notes b/checkin_notes
index 034ab67503..53c47b4db6 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6766,3 +6766,9 @@ Bruce   18 Aug 2008
         inc/
             host.inc
 
+Rom    18 Aug 2008
+    - client: Update the Windows version detection code to account for
+        Windows 7 and Windows Server 2008 "R2".
+        
+    client/
+        hostinfo_win.C
diff --git a/client/hostinfo_win.C b/client/hostinfo_win.C
index 2c3e690818..48822ac948 100644
--- a/client/hostinfo_win.C
+++ b/client/hostinfo_win.C
@@ -267,6 +267,16 @@ int get_os_information(
     {
         case VER_PLATFORM_WIN32_NT:
 
+            if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 )
+            {
+                if( osvi.wProductType == VER_NT_WORKSTATION ) {
+                    strcat(os_name, "Windows 7");
+                } else {
+                    strcat(os_name, "Windows Server 2008 \"R2\"");
+                }
+                pGPI( 6, 1, 0, 0, &dwType);
+            }
+
             if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 )
             {
                 if( osvi.wProductType == VER_NT_WORKSTATION ) {