diff --git a/common/vid_win.c b/common/vid_win.c
index cdead99..5c0a63a 100644
--- a/common/vid_win.c
+++ b/common/vid_win.c
@@ -2682,27 +2682,51 @@ void D_EndDirectRect (int x, int y, int width, int height)
 //==========================================================================
 
 byte        scantokey[128] = 
-					{ 
-//  0           1       2       3       4       5       6       7 
-//  8           9       A       B       C       D       E       F 
+{ 
+//  0       1        2       3       4       5       6       7 
+//  8       9        A       B       C       D       E       F 
 	0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6', 
-	'7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9, // 0 
+	'7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9,   // 0 
 	'q',    'w',    'e',    'r',    't',    'y',    'u',    'i', 
-	'o',    'p',    '[',    ']',    13 ,    K_CTRL,'a',  's',      // 1 
+	'o',    'p',    '[',    ']',    13,		K_CTRL, 'a',    's',      // 1 
 	'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';', 
-	'\'' ,    '`',    K_SHIFT,'\\',  'z',    'x',    'c',    'v',      // 2 
-	'b',    'n',    'm',    ',',    '.',    '/',    K_SHIFT,'*', 
-	K_ALT,' ',   K_CAPSLOCK  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-	K_F6, K_F7, K_F8, K_F9, K_F10,  K_PAUSE,    0  , K_HOME, 
-	K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',K_END, //4 
-	K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11, 
-	K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5
-	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0, 
-	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 6 
-	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0, 
-	0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0         // 7 
+	'\'',   '`',    K_SHIFT,'\\',   'z',    'x',    'c',    'v',      // 2 
+	'b',    'n',    'm',    ',',    '.',    '/',    K_SHIFT,KP_MULTIPLY,
+	K_ALT,  ' ',  K_CAPSLOCK,K_F1,  K_F2,   K_F3,   K_F4,   K_F5,     // 3 
+	K_F6,   K_F7,   K_F8,   K_F9,   K_F10,  K_PAUSE,K_SCRLCK,KP_HOME, 
+	KP_UPARROW,KP_PGUP,KP_MINUS,KP_LEFTARROW,KP_5,KP_RIGHTARROW,KP_PLUS,KP_END, // 4
+	KP_DOWNARROW,KP_PGDN,KP_INS,KP_DEL,0,   0,      0,      K_F11, 
+	K_F12,  0,      0,      0,      0,      0,      0,      0,        // 5
+	0,      0,      0,      0,      0,      0,      0,      0,
+	0,      0,      0,      0,      0,      0,      0,      0,
+	0,      0,      0,      0,      0,      0,      0,      0,
+	0,      0,      0,      0,      0,      0,      0,      0
 }; 
 
+byte        extscantokey[128] = 
+{ 
+//  0       1        2       3       4       5       6       7 
+//  8       9        A       B       C       D       E       F 
+	0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6', 
+	'7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9,   // 0 
+	'q',    'w',    'e',    'r',    't',    'y',    'u',    'i', 
+	'o',    'p',    '[',    ']',    KP_ENTER,K_CTRL,'a',    's',      // 1 
+	'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';', 
+	'\'',   '`',    K_SHIFT,'\\',   'z',    'x',    'c',    'v',      // 2 
+	'b',    'n',    'm',    ',',    '.',    KP_DIVIDE,K_SHIFT,'*',
+	K_ALT,  ' ',    K_CAPSLOCK,K_F1,K_F2,   K_F3,   K_F4,   K_F5,     // 3 
+	K_F6,   K_F7,   K_F8,   K_F9,   K_F10,  KP_NUMLCK,0,    K_HOME, 
+	K_UPARROW,K_PGUP,'-',K_LEFTARROW,'5',K_RIGHTARROW,'+',  K_END,    // 4
+	K_DOWNARROW,K_PGDN,K_INS,K_DEL, 0,      0,      0,      K_F11, 
+	K_F12,  0,      0,      0,      0,      0,      0,      0,        // 5
+	0,      0,      0,      0,      0,      0,      0,      0, 
+	0,      0,      0,      0,      0,      0,      0,      0, 
+	0,      0,      0,      0,      0,      0,      0,      0, 
+	0,      0,      0,      0,      0,      0,      0,      0
+}; 
+
+
+
 /*
 =======
 MapKey
@@ -2712,11 +2736,18 @@ Map from windows to quake keynums
 */
 int MapKey (int key)
 {
+	int extended;
+
+	extended = (key >> 24) & 1;
+
 	key = (key>>16)&255;
 	if (key > 127)
 		return 0;
 
-	return scantokey[key];
+	if (extended)
+		return extscantokey[key];
+	else
+		return scantokey[key];
 }
 
 void AppActivate(BOOL fActive, BOOL minimize)