diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index a6340ebf4c2..41b44f5a03b 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -58,6 +58,7 @@ typedef enum
     WIN7,    /* Windows 7 */
     WIN8,    /* Windows 8 */
     WIN81,   /* Windows 8.1 */
+    WIN10,   /* Windows 10 */
     NB_WINDOWS_VERSIONS
 } WINDOWS_VERSION;
 
@@ -184,6 +185,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] =
         {' ',0},
         0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
     },
+    /* WIN10 */
+    {
+        sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x2800, VER_PLATFORM_WIN32_NT,
+        {' ',0},
+        0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0
+    },
 
 };
 
@@ -207,6 +214,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] =
     "win7",                       /* WIN7 */
     "win8",                       /* WIN8 */
     "win81",                      /* WIN81 */
+    "win10",                      /* WIN10 */
 };
 
 
diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c
index fad9e5cddc6..82dc8700d17 100644
--- a/programs/winecfg/appdefaults.c
+++ b/programs/winecfg/appdefaults.c
@@ -48,6 +48,7 @@ static const struct
     const char *szProductType;
 } win_versions[] =
 {
+    { "win10",       "Windows 10",       10,  0, 0x2800,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
     { "win81",       "Windows 8.1",       6,  3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"},
     { "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"},