diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index 085f0310da9..c328bf8bd13 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -64,6 +64,17 @@ initGeneralDlg (HWND hDlg)
     char *curDOSVer = getConfigValue("Version", "DOS", "6.22");
     char *curWineLook = getConfigValue("Tweak.Layout", "WineLook", "win95");
 
+    /* normalize the version strings */
+    if (!strcmp(curWinVer, "win2000") || !strcmp(curWinVer, "nt2k") || !strcmp(curWinVer, "nt2000")) {
+	free(curWinVer);
+	curWinVer = strdup("win2k");
+    }
+
+    if (!strcmp(curWinVer, "win2k3")) {
+	free(curWinVer);
+	curWinVer = strdup("win2003");
+    }
+    
     if ((pVer = getWinVersions ()))
     {
 	for (i = 0; *pVer->szVersion; i++, pVer++)
diff --git a/programs/winecfg/properties.c b/programs/winecfg/properties.c
index e64005b5332..019e5930ffd 100644
--- a/programs/winecfg/properties.c
+++ b/programs/winecfg/properties.c
@@ -34,8 +34,8 @@ static VERSION_DESC sWinVersions[] = {
     {"win98", "Windows 98"},
     {"winme", "Windows ME"},
     {"win2k", "Windows 2000"},
-    {"win2k3", "Windows 2003"},
     {"winxp", "Windows XP"},
+    {"win2003", "Windows 2003"},
     {"", ""}
 };