Index: xkbdesc/rules/base.o_t.part
===================================================================
--- xkbdesc.orig/rules/base.o_t.part
+++ xkbdesc/rules/base.o_t.part
@@ -2,4 +2,6 @@
   caps:internal_nocancel	=	+caps(internal_nocancel)
   caps:shift			=	+caps(shift)
   caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:pc			=	+numpad(pc)
+  numpad:mac			=	+numpad(mac)
   numpad:microsoft		=	+numpad(microsoft)
Index: xkbdesc/rules/base.xml.in
===================================================================
--- xkbdesc.orig/rules/base.xml.in
+++ xkbdesc/rules/base.xml.in
@@ -3150,6 +3150,18 @@
       </configItem>
       <option>
         <configItem>
+          <name>numpad:pc</name>
+          <_description>Default numpad keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:mac</name>
+          <_description>Numpad keys work as with Mac.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>numpad:microsoft</name>
           <_description>Shift with numpad keys works as in MS Windows.</_description>
         </configItem>
Index: xkbdesc/symbols/keypad
===================================================================
--- xkbdesc.orig/symbols/keypad
+++ xkbdesc/symbols/keypad
@@ -82,8 +82,58 @@
     // End "Keypad" section
 };
 
+partial hidden default keypad_keys
+xkb_symbols "x11" {
+// Ungrab cancels server/keyboard/pointer grabs
+    key <KPDV> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]
+    };
+
+// ClsGrb kills whichever client has a grab in effect
+    key <KPMU> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]
+    };
+
+// -VMode switches to the previous video mode
+    key <KPSU> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ KP_Subtract,	XF86_Prev_VMode ]
+    };
+
+    key  <KP7> {	[  KP_Home,	KP_7	]	};
+    key  <KP8> {	[  KP_Up,	KP_8	]	};
+    key  <KP9> {	[  KP_Prior,	KP_9	]	};
+
+// +VMode switches to the next video mode
+    key <KPAD> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ KP_Add,	XF86_Next_VMode ]
+    };
+
+    key  <KP4> {	[  KP_Left,	KP_4	]	};
+    key  <KP5> {	[  KP_Begin,	KP_5	]	};
+    key  <KP6> {	[  KP_Right,	KP_6	]	};
+
+    key  <KP1> {	[  KP_End,	KP_1	]	};
+    key  <KP2> {	[  KP_Down,	KP_2	]	};
+    key  <KP3> {	[  KP_Next,	KP_3	]	};
+    key <KPEN> {	[  	KP_Enter	]	};
+    key <KPEQ> {	[  	KP_Equal	]	};
+
+    key  <KP0> {	[  KP_Insert,	KP_0	]	};
+    key <KPDL> {  	[  KP_Delete,	KP_Decimal ]	};
+};
+
 // Some national standards use comma on the keypad instead of decimal dot
 partial keypad_keys
 xkb_symbols "comma" {
     key <KPDL> {       [ KP_Delete, KP_Separator ] };
 };
+
+// Default is decimal dot
+partial keypad_keys
+xkb_symbols "dot" {
+    key <KPDL> {       [ KP_Delete, KP_Decimal ] };
+};
Index: xkbdesc/symbols/pc
===================================================================
--- xkbdesc.orig/symbols/pc
+++ xkbdesc/symbols/pc
@@ -17,7 +17,7 @@
 
     include "pc(function)"
     include "pc(editing)"
-    include "pc(keypad)"
+    include "keypad(x11)"
 
     key <BKSP> {
         type="CTRL+ALT",
@@ -29,6 +29,8 @@
 
     key <CAPS> {	[ Caps_Lock	]	};
 
+    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
+
     key <LFSH> {	[ Shift_L	]	};
     key <LCTL> {	[ Control_L	]	};
     key <LALT> {	[ Alt_L,	Meta_L		]	};
@@ -137,52 +139,6 @@
 };
 
 partial hidden alphanumeric_keys
-xkb_symbols "keypad" {
-    key <NMLK> {	[  Num_Lock, Pointer_EnableKeys		]	};
-
-// Ungrab cancels server/keyboard/pointer grabs
-    key <KPDV> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]
-    };
-
-// ClsGrb kills whichever client has a grab in effect
-    key <KPMU> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]
-    };
-
-// -VMode switches to the previous video mode
-    key <KPSU> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ KP_Subtract,	XF86_Prev_VMode ]
-    };
-
-    key  <KP7> {	[  KP_Home,	KP_7	]	};
-    key  <KP8> {	[  KP_Up,	KP_8	]	};
-    key  <KP9> {	[  KP_Prior,	KP_9	]	};
-
-// +VMode switches to the next video mode
-    key <KPAD> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ KP_Add,	XF86_Next_VMode ]
-    };
-
-    key  <KP4> {	[  KP_Left,	KP_4	]	};
-    key  <KP5> {	[  KP_Begin,	KP_5	]	};
-    key  <KP6> {	[  KP_Right,	KP_6	]	};
-
-    key  <KP1> {	[  KP_End,	KP_1	]	};
-    key  <KP2> {	[  KP_Down,	KP_2	]	};
-    key  <KP3> {	[  KP_Next,	KP_3	]	};
-    key <KPEN> {	[  	KP_Enter	]	};
-    key <KPEQ> {	[  	KP_Equal	]	};
-
-    key  <KP0> {	[  KP_Insert,	KP_0	]	};
-    key <KPDL> {  	[  KP_Delete,	KP_Decimal ]	};
-};
-
-partial hidden alphanumeric_keys
 xkb_symbols "editing" {
     key <PRSC> {
 	type= "PC_SYSRQ",
Index: xkbdesc/types/basic
===================================================================
--- xkbdesc.orig/types/basic
+++ xkbdesc/types/basic
@@ -28,13 +28,4 @@
         level_name[Level2] = "Caps";
     };
 
-    type "KEYPAD" {
-	modifiers = Shift+NumLock;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[NumLock] = Level2;
-	map[Shift+NumLock] = Level1;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Number";
-    };
 };
Index: xkbdesc/types/complete
===================================================================
--- xkbdesc.orig/types/complete
+++ xkbdesc/types/complete
@@ -8,6 +8,7 @@
 
 default xkb_types "complete" {
     include "basic"
+    include "numpad"
     include "mousekeys"
     include "pc"
     include "iso9995"
Index: xkbdesc/types/default
===================================================================
--- xkbdesc.orig/types/default
+++ xkbdesc/types/default
@@ -3,6 +3,7 @@
 
 default xkb_types "default" {
     include "basic"
+    include "numpad"
     include "pc"
     include "iso9995"
     include "extra"
Index: xkbdesc/types/extra
===================================================================
--- xkbdesc.orig/types/extra
+++ xkbdesc/types/extra
@@ -51,23 +51,6 @@
 	level_name[Level4] = "Shift Alt";
     };
 
-    // This enables the four level shifting also for the keypad.
-    type "FOUR_LEVEL_KEYPAD" {
-	modifiers = Shift+NumLock+LevelThree;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[NumLock] = Level2;
-	map[Shift+NumLock] = Level1;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[NumLock+LevelThree] = Level4;
-	map[Shift+NumLock+LevelThree] = Level3;
-	level_name[Level1] = "Base";
-	level_name[Level2] = "Number";
-	level_name[Level3] = "Alt Base";
-	level_name[Level4] = "Alt Number";
-    };       
-
 // Special type for keys used in Serbian Latin Unicode map
 // It makes it possible to use all three forms of latin letters 
 // present in Unicode that are made up of two separate letters 
@@ -91,3 +74,45 @@
     };
 };
 
+// This enables the four level shifting also for the keypad.
+partial xkb_types "keypad" {
+    virtual_modifiers LevelThree;
+
+    type "FOUR_LEVEL_KEYPAD" {
+	modifiers = Shift+NumLock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[NumLock] = Level2;
+	map[Shift+NumLock] = Level1;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[NumLock+LevelThree] = Level4;
+	map[Shift+NumLock+LevelThree] = Level3;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Number";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Alt Number";
+    };       
+};
+
+// This enables the four level shifting also for the keypad,
+// but levels 1 and 2, and 3 and 4 are swapped on Mac keypads.
+partial xkb_types "mac_keypad" {
+    virtual_modifiers LevelThree;
+
+    type "FOUR_LEVEL_KEYPAD" {
+	modifiers = Shift+NumLock+LevelThree;
+	map[None] = Level2;
+	map[Shift] = Level1;
+	map[NumLock] = Level1;
+	map[Shift+NumLock] = Level2;
+	map[LevelThree] = Level4;
+	map[Shift+LevelThree] = Level3;
+	map[NumLock+LevelThree] = Level3;
+	map[Shift+NumLock+LevelThree] = Level4;
+	level_name[Level2] = "Base";
+	level_name[Level1] = "Number";
+	level_name[Level4] = "Alt Base";
+	level_name[Level3] = "Alt Number";
+    };       
+};
Index: xkbdesc/types/numpad
===================================================================
--- xkbdesc.orig/types/numpad
+++ xkbdesc/types/numpad
@@ -1,6 +1,33 @@
 
-xkb_types "microsoft" {
+default
+xkb_types "pc" {
+    type "KEYPAD" {
+	modifiers = Shift+NumLock;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[NumLock] = Level2;
+	map[Shift+NumLock] = Level1;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Number";
+    };
+    include "extra(keypad)"
+};
+
+// On Mac keypads, level 1 and 2 are swapped
+xkb_types "mac" {
+    type "KEYPAD" {
+	modifiers = Shift+NumLock;
+	map[None] = Level2;
+	map[Shift] = Level1;
+	map[NumLock] = Level1;
+	map[Shift+NumLock] = Level2;
+	level_name[Level2] = "Base";
+	level_name[Level1] = "Number";
+    };
+    include "extra(mac_keypad)"
+};
 
+xkb_types "microsoft" {
     type "KEYPAD" {
         modifiers = Shift+NumLock;
         map[None] = Level1;
@@ -9,4 +36,6 @@
         level_name[Level1] = "Base";
         level_name[Level2] = "Number";
     };
+    include "extra(keypad)"
 };
+
Index: xkbdesc/rules/base.m_t.part
===================================================================
--- xkbdesc.orig/rules/base.m_t.part
+++ xkbdesc/rules/base.m_t.part
@@ -1 +1,2 @@
+  $macs		=	complete+numpad(mac)
   *		=	complete
Index: xkbdesc/symbols/macintosh_vndr/us
===================================================================
--- xkbdesc.orig/symbols/macintosh_vndr/us
+++ xkbdesc/symbols/macintosh_vndr/us
@@ -67,34 +67,11 @@
     key <SPCE> {	[  space			]	};
     // End alphanumeric section
 
-    // Begin "Keypad" section
     key <NMLK> {	[  Num_Lock,	Pointer_EnableKeys	]	};
-    key <KPEQ> {	[  equal				]	};
-    key <KPDV> {	[  KP_Divide				]	};
-    key <KPMU> {	[  KP_Multiply				]	};
-
-    key  <KP7> {	[  KP_7,	KP_Home			]	};
-    key  <KP8> {	[  KP_8,	KP_Up			]	};
-    key  <KP9> {	[  KP_9,	KP_Prior		]	};
-    key <KPSU> {	[  KP_Subtract				]	};
-
-    key  <KP4> {	[  KP_4,	KP_Left			]	};
-    key  <KP5> {	[  KP_5,	KP_Begin		]	};
-    key  <KP6> {	[  KP_6,	KP_Right		]	};
-    key <KPAD> {	[  KP_Add				]	};
-
-    key  <KP1> {	[  KP_1,	KP_End			]	};
-    key  <KP2> {	[  KP_2,	KP_Down			]	};
-    key  <KP3> {	[  KP_3,	KP_Next			]	};
-    key <KPEN> {	[  KP_Enter				]	};
-
-    key  <KP0> {	[  KP_0,	KP_Insert		]	};
-    key <KPDL> { 	[  KP_Decimal,	KP_Delete		]	};
-    // End "Keypad" section
 
-    include "compose(rwin)"
-    include "macintosh_vndr/apple(extended)"
+    include "keypad"
 
+    key <KPEQ> {	[  equal				]	};
 };
 
 hidden
Index: xkbdesc/symbols/macintosh_vndr/it
===================================================================
--- xkbdesc.orig/symbols/macintosh_vndr/it
+++ xkbdesc/symbols/macintosh_vndr/it
@@ -58,9 +58,7 @@
 
     // End alphanumeric section
 
-    key <KPDL> {	[ KP_Decimal , KP_Delete	]	};
-    // End "Keypad" section
-
+    include "keypad(dot)"
     include "level3(ralt_switch)"
 };