Index: rules/base.lists.part
===================================================================
--- rules/base.lists.part.orig
+++ rules/base.lists.part
@@ -73,6 +73,8 @@
               toshiba_s3000 trust trustda \
               unitekkb1925 yahoo
 
+! $specialkbds = ibm_space_saver
+
 // all layouts with 3rd and 4th groups
 ! $threelevellayouts = al az \
               be br bt \
Index: rules/base.m_s.part
===================================================================
--- rules/base.m_s.part.orig
+++ rules/base.m_s.part
@@ -1,4 +1,5 @@
   a4techKB21    =       +inet(media_nav_common)
+  $specialkbds  =       +group(%m)
   a4techKBS8    =       +inet(media_nav_acpi_common)
   a4_rfkb23     =       +inet(media_nav_acpi_common)
   asus_laptop   =       +inet(media_common)
Index: rules/base.xml.in
===================================================================
--- rules/base.xml.in.orig
+++ rules/base.xml.in
@@ -1051,6 +1051,12 @@
     </model>
     <model>
       <configItem>
+        <name>ibm_space_saver</name>
+        <_description>IBM Space Saver</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>macintosh</name>
         <_description>Macintosh</_description>
 	<vendor>Apple</vendor>
Index: symbols/group
===================================================================
--- symbols/group.orig
+++ symbols/group
@@ -352,6 +352,11 @@ xkb_symbols "rctrl_toggle" {
     };
 };
 
+// Override broken Numlock key on some IBM keyboards
+partial
+xkb_symbols "ibm_space_saver" {
+    key <NMLK> {        [  Num_Lock, Num_Lock   ]       };
+};
 // using the group(alt_caps_toggle) map, pressing:
 //     Alt+Caps Lock toggles group
 //     Caps Lock toggles caps lock