diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index 745ee5d0410..86637fc15fb 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -55,6 +55,7 @@ typedef enum
     WIN2K8,  /* Windows 2008 */
     WIN2K8R2,/* Windows 2008 R2 */
     WIN7,    /* Windows 7 */
+    WIN8,    /* Windows 8 */
     NB_WINDOWS_VERSIONS
 } WINDOWS_VERSION;
 
@@ -163,6 +164,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
         {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0},
         1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_SERVER, 0
     },
+    /* WIN8 */
+    {
+        sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT,
+        {' ',0},
+        0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
+    },
 
 };
 
@@ -183,6 +190,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] =
     "win2008,win2k8",             /* WIN2K8 */
     "win2008r2,win2k8r2",         /* WIN2K8R2 */
     "win7",                       /* WIN7 */
+    "win8",                       /* WIN8 */
 };
 
 
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index 80df90c3acd..c8940a65139 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -49,6 +49,7 @@ static const struct
     const char *szProductType;
 } win_versions[] =
 {
+    { "win8",        "Windows 8",         6,  2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
     { "win2008r2",   "Windows 2008 R2",   6,  1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},
     { "win7",        "Windows 7",         6,  1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"},
     { "win2008",     "Windows 2008",      6,  0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},