--- dvb/linux/drivers/media/rc/keymaps/rc-rc6-mce.c	2011-11-24 05:45:52.000000000 +0100
+++ dvb/linux/drivers/media/rc/keymaps/rc-rc6-mce.c-n	2012-10-13 15:37:42.000000000 +0200
@@ -17,21 +17,21 @@
 
 static struct rc_map_table rc6_mce[] = {
 
-	{ 0x800f0400, KEY_NUMERIC_0 },
-	{ 0x800f0401, KEY_NUMERIC_1 },
-	{ 0x800f0402, KEY_NUMERIC_2 },
-	{ 0x800f0403, KEY_NUMERIC_3 },
-	{ 0x800f0404, KEY_NUMERIC_4 },
-	{ 0x800f0405, KEY_NUMERIC_5 },
-	{ 0x800f0406, KEY_NUMERIC_6 },
-	{ 0x800f0407, KEY_NUMERIC_7 },
-	{ 0x800f0408, KEY_NUMERIC_8 },
-	{ 0x800f0409, KEY_NUMERIC_9 },
-
-	{ 0x800f040a, KEY_DELETE },
-	{ 0x800f040b, KEY_ENTER },
-	{ 0x800f040c, KEY_SLEEP },		/* Formerly PC Power */
-	{ 0x800f040d, KEY_MEDIA },		/* Windows MCE button */
+	{ 0x800f0400, KEY_0 },
+	{ 0x800f0401, KEY_1 },
+	{ 0x800f0402, KEY_2 },
+	{ 0x800f0403, KEY_3 },
+	{ 0x800f0404, KEY_4 },
+	{ 0x800f0405, KEY_5 },
+	{ 0x800f0406, KEY_6 },
+	{ 0x800f0407, KEY_7 },
+	{ 0x800f0408, KEY_8 },
+	{ 0x800f0409, KEY_9 },
+
+	{ 0x800f040a, KEY_PROG1 },
+	{ 0x800f040b, KEY_PROG2 },
+	{ 0x800f040c, KEY_POWER2 },		/* Formerly PC Power */
+	{ 0x800f040d, KEY_MENU },		/* Windows MCE button */
 	{ 0x800f040e, KEY_MUTE },
 	{ 0x800f040f, KEY_INFO },
 
@@ -47,9 +47,9 @@
 	{ 0x800f0418, KEY_PAUSE },
 	{ 0x800f0419, KEY_STOP },
 	{ 0x800f041a, KEY_NEXT },
-	{ 0x800f041b, KEY_PREVIOUS },
-	{ 0x800f041c, KEY_NUMERIC_POUND },
-	{ 0x800f041d, KEY_NUMERIC_STAR },
+	{ 0x800f041b, KEY_ESC },
+	{ 0x800f041c, KEY_FAVORITES },
+	{ 0x800f041d, KEY_MODE },
 
 	{ 0x800f041e, KEY_UP },
 	{ 0x800f041f, KEY_DOWN },
@@ -57,9 +57,9 @@
 	{ 0x800f0421, KEY_RIGHT },
 
 	{ 0x800f0422, KEY_OK },
-	{ 0x800f0423, KEY_EXIT },
-	{ 0x800f0424, KEY_DVD },
-	{ 0x800f0425, KEY_TUNER },		/* LiveTV */
+	{ 0x800f0423, KEY_BACK },
+	{ 0x800f0424, KEY_CHANNEL },
+	{ 0x800f0425, KEY_SUBTITLE },		/* LiveTV */
 	{ 0x800f0426, KEY_EPG },		/* Guide */
 	{ 0x800f0427, KEY_ZOOM },		/* Aspect */
 
@@ -71,15 +71,15 @@
 	{ 0x800f0446, KEY_TV },
 	{ 0x800f0447, KEY_AUDIO },		/* My Music */
 	{ 0x800f0448, KEY_PVR },		/* RecordedTV */
-	{ 0x800f0449, KEY_CAMERA },
+	{ 0x800f0449, KEY_IMAGES },
 	{ 0x800f044a, KEY_VIDEO },
 	{ 0x800f044c, KEY_LANGUAGE },
 	{ 0x800f044d, KEY_TITLE },
 	{ 0x800f044e, KEY_PRINT },	/* Print - HP OEM version of remote */
 
-	{ 0x800f0450, KEY_RADIO },
+	{ 0x800f0450, KEY_FN },
 
-	{ 0x800f045a, KEY_SUBTITLE },		/* Caption/Teletext */
+	{ 0x800f045a, KEY_TEXT },		/* Caption/Teletext */
 	{ 0x800f045b, KEY_RED },
 	{ 0x800f045c, KEY_GREEN },
 	{ 0x800f045d, KEY_YELLOW },