diff -Naur xkb.old/rules/xfree86 xkb/rules/xfree86
--- xkb.old/rules/xfree86	2005-07-25 09:49:48.000000000 +0200
+++ xkb/rules/xfree86	2005-07-25 09:53:51.000000000 +0200
@@ -106,7 +106,7 @@
               cherryblue cherrybluea cherryblueb \
               chicony chicony9885 \
               compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
-              dell inspiron dtk2000 \
+              dell inspiron inspiron8600 dtk2000 \
               dexxa diamond genius geniuscomfy2 \
               ennyah_dkb1008 \
               hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
diff -Naur xkb.old/rules/xfree86.lst xkb/rules/xfree86.lst
--- xkb.old/rules/xfree86.lst	2005-07-25 09:49:48.000000000 +0200
+++ xkb/rules/xfree86.lst	2005-07-25 09:54:22.000000000 +0200
@@ -42,7 +42,8 @@
   presario	Laptop/notebook Compaq (eg. Presario) Internet Keyboard
   ipaq		Compaq iPaq Keyboard
   dell		Dell
-  inspiron	Laptop/notebook Dell Inspiron 8xxx
+  inspiron	Laptop/notebook Dell Inspiron 8xxx (Not for 8600)
+  inspiron8600	Laptop/notebook Dell Inspiron 8600
   dexxa		Dexxa Wireless Desktop Keyboard
   diamond	Diamond 9801 / 9802 series
   dtk2000	DTK2000
diff -Naur xkb.old/rules/xfree86.xml xkb/rules/xfree86.xml
--- xkb.old/rules/xfree86.xml	2005-07-25 09:49:48.000000000 +0200
+++ xkb/rules/xfree86.xml	2005-07-25 09:56:34.000000000 +0200
@@ -437,7 +437,7 @@
     <model>
       <configItem>
         <name>inspiron</name>
-        <description>Laptop/notebook Dell Inspiron 8xxx</description>
+	<description>Laptop/notebook Dell Inspiron 8xxx (Not for 8600)</description>
         <description xml:lang="da">Bærbar Dell Inspiron 8xxx</description>
         <description xml:lang="fr">clavier Laptop/notebook Dell Inspiron 8xxx</description>
         <description xml:lang="ru">Настольная/портативная для Dell Inspiron 8xxx</description>
@@ -448,6 +448,12 @@
     </model>
     <model>
       <configItem>
+        <name>inspiron8600</name>
+	<description>Laptop/notebook Dell Inspiron 8600</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>dexxa</name>
         <description>Dexxa Wireless Desktop Keyboard</description>
         <description xml:lang="fr">clavier Dexxa Wireless Desktop</description>
diff -Naur xkb.old/rules/xorg xkb/rules/xorg
--- xkb.old/rules/xorg	2005-07-25 09:49:48.000000000 +0200
+++ xkb/rules/xorg	2005-07-25 09:53:51.000000000 +0200
@@ -106,7 +106,7 @@
               cherryblue cherrybluea cherryblueb \
               chicony chicony9885 \
               compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
-              dell inspiron dtk2000 \
+              dell inspiron inspiron8600 dtk2000 \
               dexxa diamond genius geniuscomfy2 \
               ennyah_dkb1008 \
               hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
diff -Naur xkb.old/rules/xorg.lst xkb/rules/xorg.lst
--- xkb.old/rules/xorg.lst	2005-07-25 09:49:48.000000000 +0200
+++ xkb/rules/xorg.lst	2005-07-25 09:54:22.000000000 +0200
@@ -42,7 +42,8 @@
   presario	Laptop/notebook Compaq (eg. Presario) Internet Keyboard
   ipaq		Compaq iPaq Keyboard
   dell		Dell
-  inspiron	Laptop/notebook Dell Inspiron 8xxx
+  inspiron	Laptop/notebook Dell Inspiron 8xxx (Not for 8600)
+  inspiron8600	Laptop/notebook Dell Inspiron 8600
   dexxa		Dexxa Wireless Desktop Keyboard
   diamond	Diamond 9801 / 9802 series
   dtk2000	DTK2000
diff -Naur xkb.old/rules/xorg.xml xkb/rules/xorg.xml
--- xkb.old/rules/xorg.xml	2005-07-25 09:49:48.000000000 +0200
+++ xkb/rules/xorg.xml	2005-07-25 09:56:34.000000000 +0200
@@ -437,7 +437,7 @@
     <model>
       <configItem>
         <name>inspiron</name>
-        <description>Laptop/notebook Dell Inspiron 8xxx</description>
+	<description>Laptop/notebook Dell Inspiron 8xxx (Not for 8600)</description>
         <description xml:lang="da">Bærbar Dell Inspiron 8xxx</description>
         <description xml:lang="fr">clavier Laptop/notebook Dell Inspiron 8xxx</description>
         <description xml:lang="ru">Настольная/портативная для Dell Inspiron 8xxx</description>
@@ -448,6 +448,12 @@
     </model>
     <model>
       <configItem>
+        <name>inspiron8600</name>
+	<description>Laptop/notebook Dell Inspiron 8600</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>dexxa</name>
         <description>Dexxa Wireless Desktop Keyboard</description>
         <description xml:lang="fr">clavier Dexxa Wireless Desktop</description>
diff -Naur xkb.old/symbols/inet xkb/symbols/inet
--- xkb.old/symbols/inet	2005-07-25 09:49:49.000000000 +0200
+++ xkb/symbols/inet	2005-07-25 09:41:54.000000000 +0200
@@ -650,7 +650,7 @@
 
 partial alphanumeric_keys
 xkb_symbols "inspiron" {
-    name[Group1]= "Laptop/notebook Dell Inspiron 8xxx";
+    name[Group1]= "Laptop/notebook Dell Inspiron 8xxx (Not for 8600)";
 
     key <XFER>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <NFER>	{	[ XF86AudioPrev		]	};
@@ -661,6 +661,18 @@
     key <I20>	{	[ XF86AudioMute		]	};
 };
 
+partial alphanumeric_keys
+xkb_symbols "inspiron8600" {
+    name[Group1]= "Laptop/notebook Dell Inspiron 8600";
+
+    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
+    key <I24>	{	[ XF86AudioStop		]	};
+    key <I10>	{	[ XF86AudioPrev		]	};
+    key <I19>	{	[ XF86AudioNext		]	};
+    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    key <I2E>	{	[ XF86AudioLowerVolume	]	};
+    key <I20>	{	[ XF86AudioMute		]	};
+};
 
 // Dexxa