--- dvb/linux/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c	2012-10-04 17:17:21.000000000 +0200
+++ dvb/linux/drivers/media/rc/keymaps/rc-medion-x10-digitainer.c-n	2012-10-05 01:08:43.000000000 +0200
@@ -27,16 +27,16 @@
 #include <media/rc-map.h>
 
 static struct rc_map_table medion_x10_digitainer[] = {
-	{ 0x02, KEY_POWER },
+	{ 0x02, KEY_POWER2 },
 
-	{ 0x2c, KEY_TV },
-	{ 0x2d, KEY_VIDEO },
-	{ 0x04, KEY_DVD },    /* CD/DVD */
+	{ 0x2c, KEY_PVR },
+	{ 0x2d, KEY_VIDEO },  /*User6 */
+	{ 0x04, KEY_MODE },    /* CD/DVD */
 	{ 0x16, KEY_TEXT },   /* "teletext" icon, i.e. a screen with lines */
-	{ 0x06, KEY_AUDIO },
-	{ 0x2e, KEY_RADIO },
+	{ 0x06, KEY_AUDIO },  /* User5 */
+	{ 0x2e, KEY_SUBTITLE },
 	{ 0x31, KEY_EPG },    /* a screen with an open book */
-	{ 0x05, KEY_IMAGES }, /* Photo */
+	{ 0x05, KEY_IMAGES }, /* User7,  Photo */
 	{ 0x2f, KEY_INFO },
 
 	{ 0x78, KEY_UP },     /* scrollwheel up 1 notch */
@@ -55,11 +55,11 @@
 	{ 0x08, KEY_VOLUMEDOWN },
 	{ 0x00, KEY_MUTE },
 
-	{ 0x1b, KEY_SELECT }, /* also has "U" rotated 90 degrees CCW */
+	{ 0x1b, KEY_SETUP },  /* SELECT */ /* also has "U" rotated 90 degrees CCW */
 
 	{ 0x0b, KEY_CHANNELUP },
 	{ 0x0c, KEY_CHANNELDOWN },
-	{ 0x1c, KEY_LAST },
+	{ 0x1c, KEY_ESC }, /* LAST */
 
 	{ 0x32, KEY_RED },    /* also Audio */
 	{ 0x33, KEY_GREEN },  /* also Subtitle */
@@ -70,11 +70,11 @@
 	{ 0x29, KEY_PAUSE },
 	{ 0x25, KEY_PLAY },
 	{ 0x21, KEY_PREVIOUS },
-	{ 0x18, KEY_CAMERA },
+	{ 0x18, KEY_PROG2 }, /* CAMERA */
 	{ 0x23, KEY_NEXT },
 	{ 0x24, KEY_REWIND },
 	{ 0x27, KEY_RECORD },
-	{ 0x26, KEY_FORWARD },
+	{ 0x26, KEY_FASTFORWARD }, /* FORWARD */
 
 	{ 0x0d, KEY_1 },
 	{ 0x0e, KEY_2 },