diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 0f966b841b..a6b3f76396 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -899,6 +899,7 @@ inline wxString wxGetFullModuleName()
 //      0x0502      Windows XP SP2, 2003 SP1
 //      0x0600      Windows Vista, 2008
 //      0x0601      Windows 7
+//      0x0602      Windows 8 (currently also returned for 8.1)
 //
 // for the other Windows versions 0 is currently returned
 enum wxWinVersion
@@ -926,7 +927,9 @@ enum wxWinVersion
     wxWinVersion_Vista = wxWinVersion_6,
     wxWinVersion_NT6 = wxWinVersion_6,
 
-    wxWinVersion_7 = 0x601
+    wxWinVersion_7 = 0x601,
+
+    wxWinVersion_8 = 0x602
 };
 
 WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index a6032b706d..33322697e7 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1478,10 +1478,19 @@ wxWinVersion wxGetWinVersion()
                     break;
 
                 case 6:
-                    return wxWinVersion_NT6;
-            }
-            break;
+                    switch ( verMin )
+                    {
+                        case 0:
+                            return wxWinVersion_Vista;
 
+                        case 1:
+                            return wxWinVersion_7;
+
+                        case 2:
+                            return wxWinVersion_8;
+                    }
+                    break;
+            }
         default:
             // Do nothing just to silence GCC warning
             break;