diff -u xkeyboard-config-0.8/debian/changelog xkeyboard-config-0.8/debian/changelog
--- xkeyboard-config-0.8/debian/changelog
+++ xkeyboard-config-0.8/debian/changelog
@@ -1,3 +1,11 @@
+xkeyboard-config (0.8-6sladen1) dapper; urgency=low
+
+  * Make the XF86* special-keys match their /dev/input counterparts in
+    /usr/include/linux/input.h .  This might be better done by using 
+    'keycodes/evdev' and populating that instead.
+
+ -- Paul Sladen <ubuntu@paul.sladen.org>  Tue, 09 May 2006 12:06:22 +0100
+
 xkeyboard-config (0.8-6) dapper; urgency=low
 
   * debian/rules: Generate a POT file. Closes: LP##35407.
diff -u xkeyboard-config-0.8/symbols/pc xkeyboard-config-0.8/symbols/pc
--- xkeyboard-config-0.8/symbols/pc
+++ xkeyboard-config-0.8/symbols/pc
@@ -215,6 +215,29 @@
     key <RWIN> {	[	Super_R			]	};
     key <MENU> {	[	Menu			]	};
 
+    // Additional symbols to match /usr/include/linux/input.h
+    // and allow the standardised keys to work out of the box.
+    // The <IXX> vales are hex values, minus 128 ...or something.
+    key <I20>   {       [ XF86AudioMute         ]       };
+    key <I2E>   {       [ XF86AudioLowerVolume  ]       };	
+    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+
+    key <I10>   {       [ XF86AudioPrev         ]       };
+    key <I19>   {       [ XF86AudioNext         ]       };
+    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
+    key <I24>   {       [ XF86AudioStop ]    };
+
+    key <I32>   {       [ XF86HomePage          ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86Favorites         ]       };
+    key <I67>   {       [ XF86Refresh           ]       };
+    key <I68>   {       [ XF86Stop              ]       };
+
+    key <I69>   {       [ XF86Forward           ]       };
+    key <I6A>   {       [ XF86Back              ]       };
+
+    // key <I6B>   {       [ XF86MyComputer        ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
 };
 
 // defintion which includes both the Windows95 keyboards _and_
only in patch2:
unchanged:
--- xkeyboard-config-0.8.orig/keycodes/xfree86
+++ xkeyboard-config-0.8/keycodes/xfree86
@@ -194,8 +194,8 @@
     <I19> =   153;
     <I1A> =   154;
     <I1B> =   155;
-    // <I1C> =   156;	<META>
-    // <I1D> =   157;	<K59>
+    <I1C> =   156; //	<META>
+    <I1D> =   157; //	<K59>
     <I1E> =   158;
     <I1F> =   159;
     <I20> =   160;
@@ -208,7 +208,7 @@
     <I27> =   167;
     <I28> =   168;
     <I29> =   169;
-    // <I2A> =   170;	<K5A>
+    <I2A> =   170; //	<K5A>
     <I2B> =   171;
     <I2C> =   172;
     <I2D> =   173;
@@ -219,37 +219,37 @@
     <I32> =   178;
     <I33> =   179;
     <I34> =   180;
-    // <I35> =   181;	<K5B>
-    // <I36> =   182;	<K5D>
-    // <I37> =   183;	<K5E>
-    // <I38> =   184;	<K5F>
+    <I35> =   181; //	<K5B>
+    <I36> =   182; //	<K5D>
+    <I37> =   183; //	<K5E>
+    <I38> =   184; //	<K5F>
     <I39> =   185;
     <I3A> =   186;
     <I3B> =   187;
     <I3C> =   188;
-    // <I3D> =   189;	<K62>
-    // <I3E> =   190;	<K63>
-    // <I3F> =   191;	<K64>
-    // <I40> =   192;	<K65>
-    // <I41> =   193;	<K66>
+    <I3D> =   189; //	<K62>
+    <I3E> =   190; //	<K63>
+    <I3F> =   191; //	<K64>
+    <I40> =   192; //	<K65>
+    <I41> =   193; //	<K66>
     <I42> =   194;
     <I43> =   195;
     <I44> =   196;
     <I45> =   197;
-    // <I46> =   198;	<K67>
-    // <I47> =   199;	<K68>
-    // <I48> =   200;	<K69>
-    // <I49> =   201;	<K6A>
+    <I46> =   198; //	<K67>
+    <I47> =   199; //	<K68>
+    <I48> =   200; //	<K69>
+    <I49> =   201; //	<K6A>
     <I4A> =   202;
-    // <I4B> =   203;	<K6B>
-    // <I4C> =   204;	<K6C>
-    // <I4D> =   205;	<K6D>
-    // <I4E> =   206;	<K6E>
-    // <I4F> =   207;	<K6F>
-    // <I50> =   208;	<K70>
-    // <I51> =   209;	<K71>
-    // <I52> =   210;	<K72>
-    // <I53> =   211;	<K73>
+    <I4B> =   203; //	<K6B>
+    <I4C> =   204; //	<K6C>
+    <I4D> =   205; //	<K6D>
+    <I4E> =   206; //	<K6E>
+    <I4F> =   207; //	<K6F>
+    <I50> =   208; //	<K70>
+    <I51> =   209; //	<K71>
+    <I52> =   210; //	<K72>
+    <I53> =   211; //	<K73>
     <I54> =   212;
     <I55> =   213;
     <I56> =   214;
@@ -257,9 +257,9 @@
     <I58> =   216;
     <I59> =   217;
     <I5A> =   218;
-    // <I5B> =   219;	<K74>
-    // <I5C> =   220;	<K75>
-    // <I5D> =   221;	<K76>
+    <I5B> =   219; //	<K74>
+    <I5C> =   220; //	<K75>
+    <I5D> =   221; //	<K76>
     <I5E> =   222;
     <I5F> =   223;
     <I60> =   224;