diff -uNr xkb-orig/rules/xfree86 xkb/rules/xfree86
--- xkb-orig/rules/xfree86	2005-08-05 18:08:19.000000000 -0400
+++ xkb/rules/xfree86	2005-08-05 18:18:44.000000000 -0400
@@ -108,7 +108,7 @@
               compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
               dell inspiron dtk2000 \
               dexxa diamond genius geniuscomfy2 \
-              ennyah_dkb1008 \
+              emachines ennyah_dkb1008 \
               hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
               hp500fa hp5xx hp5185 \
               honeywell_euroboard \
diff -uNr xkb-orig/rules/xfree86.lst xkb/rules/xfree86.lst
--- xkb-orig/rules/xfree86.lst	2005-08-05 18:08:19.000000000 -0400
+++ xkb/rules/xfree86.lst	2005-08-05 18:19:33.000000000 -0400
@@ -46,6 +46,7 @@
   dexxa		Dexxa Wireless Desktop Keyboard
   diamond	Diamond 9801 / 9802 series
   dtk2000	DTK2000
+  emachines	Laptop/notebook eMachines m68xx
   ennyah_dkb1008 Ennyah DKB-1008
   genius	Genius Comfy KB-16M / Genius MM Keyboard KWD-910
   geniuscomfy2	Genius Comfy KB-21e-Scroll
diff -uNr xkb-orig/rules/xfree86.xml xkb/rules/xfree86.xml
--- xkb-orig/rules/xfree86.xml	2005-08-05 18:08:19.000000000 -0400
+++ xkb/rules/xfree86.xml	2005-08-05 18:20:53.000000000 -0400
@@ -481,6 +481,12 @@
     </model>
     <model>
       <configItem>
+        <name>emachines</name>
+	<description>Laptop/notebook eMachines m68xx</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>ennyah_dkb1008</name>
         <description>Ennyah DKB-1008</description>
       </configItem>
diff -uNr xkb-orig/rules/xorg xkb/rules/xorg
--- xkb-orig/rules/xorg	2005-08-05 18:08:19.000000000 -0400
+++ xkb/rules/xorg	2005-08-05 18:18:44.000000000 -0400
@@ -108,7 +108,7 @@
               compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
               dell inspiron dtk2000 \
               dexxa diamond genius geniuscomfy2 \
-              ennyah_dkb1008 \
+              emachines ennyah_dkb1008 \
               hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
               hp500fa hp5xx hp5185 \
               honeywell_euroboard \
diff -uNr xkb-orig/rules/xorg.lst xkb/rules/xorg.lst
--- xkb-orig/rules/xorg.lst	2005-08-05 18:08:19.000000000 -0400
+++ xkb/rules/xorg.lst	2005-08-05 18:19:33.000000000 -0400
@@ -46,6 +46,7 @@
   dexxa		Dexxa Wireless Desktop Keyboard
   diamond	Diamond 9801 / 9802 series
   dtk2000	DTK2000
+  emachines	Laptop/notebook eMachines m68xx
   ennyah_dkb1008 Ennyah DKB-1008
   genius	Genius Comfy KB-16M / Genius MM Keyboard KWD-910
   geniuscomfy2	Genius Comfy KB-21e-Scroll
diff -uNr xkb-orig/rules/xorg.xml xkb/rules/xorg.xml
--- xkb-orig/rules/xorg.xml	2005-08-05 18:08:19.000000000 -0400
+++ xkb/rules/xorg.xml	2005-08-05 18:20:53.000000000 -0400
@@ -481,6 +481,12 @@
     </model>
     <model>
       <configItem>
+        <name>emachines</name>
+	<description>Laptop/notebook eMachines m68xx</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>ennyah_dkb1008</name>
         <description>Ennyah DKB-1008</description>
       </configItem>
diff -uNr xkb-orig/symbols/inet xkb/symbols/inet
--- xkb-orig/symbols/inet	2005-08-05 18:08:18.000000000 -0400
+++ xkb/symbols/inet	2005-08-05 18:17:56.000000000 -0400
@@ -740,6 +740,40 @@
     key <I6D>   {       [ XF86AudioMedia        ]       };
 };
 
+// eMachines
+
+partial alphanumeric_keys
+xkb_symbols "emachines" {
+    name[Group1]= "Laptop/notebook eMachines m68xx";
+
+    key <I2E>  {  [ XF86AudioLowerVolume          ]  };
+    key <I6D>  {  [ XF86AudioMedia                ]  };
+    key <I30>  {  [ XF86AudioRaiseVolume          ]  };
+    key <I20>  {  [ XF86AudioMute                 ]  };
+    key <I6C>  {  [ XF86Mail                      ]  };
+    key <I32>  {  [ XF86iTouch                    ]  };
+    key <I65>  {  [ XF86Search                    ]  };
+    key <I5F>  {  [ XF86Sleep                     ]  };
+    key <I22>  {  [ XF86AudioPlay, XF86AudioPause ]  };
+    key <I24>  {  [ XF86AudioStop                 ]  };
+    key <I10>  {  [ XF86AudioPrev                 ]  };
+    key <I19>  {  [ XF86AudioNext                 ]  };
+    key <KP0>  {  [ KP_0                          ]  };
+    key <KP1>  {  [ KP_1                          ]  };
+    key <KP2>  {  [ KP_2                          ]  };
+    key <KP3>  {  [ KP_3                          ]  };
+    key <KP4>  {  [ KP_4                          ]  };
+    key <KP5>  {  [ KP_5                          ]  };
+    key <KP6>  {  [ KP_6                          ]  };
+    key <KP7>  {  [ KP_7                          ]  };
+    key <KP8>  {  [ KP_8                          ]  };
+    key <KP9>  {  [ KP_9                          ]  };
+    key <KPDL> {  [ KP_Decimal                    ]  };
+    key <KPAD> {  [ KP_Add                        ]  };
+    key <KPSU> {  [ KP_Subtract                   ]  };
+    key <KPMU> {  [ KP_Multiply                   ]  };
+    key <KPDV> {  [ KP_Divide                     ]  };
+};
 
 // Ennyah