--- dvb/linux/drivers/media/rc/keymaps/rc-medion-x10.c	2011-12-31 05:46:00.000000000 +0100
+++ dvb/linux/drivers/media/rc/keymaps/rc-medion-x10.c-n	2012-10-06 20:40:57.000000000 +0200
@@ -25,18 +25,18 @@
 #include <media/rc-map.h>
 
 static struct rc_map_table medion_x10[] = {
-	{ 0x2c, KEY_TV },    /* TV */
-	{ 0x2d, KEY_VCR },   /* VCR */
-	{ 0x04, KEY_DVD },   /* DVD */
-	{ 0x06, KEY_AUDIO }, /* MUSIC */
+	{ 0x2c, KEY_PROG1 },    /* TV */
+	{ 0x2d, KEY_PVR },   /* VCR */
+	{ 0x04, KEY_PROG2 },   /* DVD */
+	{ 0x06, KEY_MODE }, /* MUSIC */
 
 	{ 0x2e, KEY_RADIO },     /* RADIO */
-	{ 0x05, KEY_DIRECTORY }, /* PHOTO */
-	{ 0x2f, KEY_INFO },      /* TV-PREVIEW */
-	{ 0x30, KEY_LIST },      /* CHANNEL-LST */
+	{ 0x05, KEY_IMAGES }, /* PHOTO */
+	{ 0x2f, KEY_EPG },      /* TV-PREVIEW */
+	{ 0x30, KEY_CHANNEL },      /* CHANNEL-LST */
 
 	{ 0x1b, KEY_SETUP }, /* SETUP */
-	{ 0x31, KEY_VIDEO }, /* VIDEO DESKTOP */
+	{ 0x31, KEY_FAVORITES }, /* VIDEO DESKTOP */
 
 	{ 0x08, KEY_VOLUMEDOWN },  /* VOL - */
 	{ 0x09, KEY_VOLUMEUP },    /* VOL + */
@@ -48,7 +48,7 @@
 	{ 0x33, KEY_GREEN }, /* green */
 	{ 0x34, KEY_YELLOW }, /* yellow */
 	{ 0x35, KEY_BLUE }, /* blue */
-	{ 0x16, KEY_TEXT }, /* TXT */
+	{ 0x16, KEY_SUBTITLE }, /* TXT */
 
 	{ 0x0d, KEY_1 },
 	{ 0x0e, KEY_2 },
@@ -60,11 +60,11 @@
 	{ 0x14, KEY_8 },
 	{ 0x15, KEY_9 },
 	{ 0x17, KEY_0 },
-	{ 0x1c, KEY_SEARCH }, /* TV/RAD, CH SRC */
-	{ 0x20, KEY_DELETE }, /* DELETE */
+	{ 0x1c, KEY_TV }, /* TV/RAD, CH SRC */
+	{ 0x20, KEY_FN }, /* DELETE */
 
-	{ 0x36, KEY_KEYBOARD }, /* RENAME */
-	{ 0x18, KEY_SCREEN },   /* SNAPSHOT */
+	{ 0x36, KEY_INFO }, /* RENAME */
+	{ 0x18, KEY_VIDEO },   /* SNAPSHOT */
 
 	{ 0x1a, KEY_UP },    /* up */
 	{ 0x22, KEY_DOWN },  /* down */
@@ -72,23 +72,23 @@
 	{ 0x1f, KEY_RIGHT }, /* right */
 	{ 0x1e, KEY_OK },    /* OK */
 
-	{ 0x37, KEY_SELECT }, /* ACQUIRE IMAGE */
-	{ 0x38, KEY_EDIT },   /* EDIT IMAGE */
+	{ 0x37, KEY_MENU }, /* ACQUIRE IMAGE */
+	{ 0x38, KEY_BACK },   /* EDIT IMAGE */
 
 	{ 0x24, KEY_REWIND },   /* rewind  (<<) */
 	{ 0x25, KEY_PLAY },     /* play    ( >) */
-	{ 0x26, KEY_FORWARD },  /* forward (>>) */
+	{ 0x26, KEY_FASTFORWARD },  /* forward (>>) */
 	{ 0x27, KEY_RECORD },   /* record  ( o) */
 	{ 0x28, KEY_STOP },     /* stop    ([]) */
 	{ 0x29, KEY_PAUSE },    /* pause   ('') */
 
-	{ 0x21, KEY_PREVIOUS },        /* prev */
-	{ 0x39, KEY_SWITCHVIDEOMODE }, /* F SCR */
+	{ 0x21, KEY_ESC },        /* prev */
+	{ 0x39, KEY_SCREEN }, /* F SCR */
 	{ 0x23, KEY_NEXT },            /* next */
-	{ 0x19, KEY_MENU },            /* MENU */
-	{ 0x3a, KEY_LANGUAGE },        /* AUDIO */
+	{ 0x19, KEY_TIME },            /* MENU */
+	{ 0x3a, KEY_MODE },        /* AUDIO */
 
-	{ 0x02, KEY_POWER }, /* POWER */
+	{ 0x02, KEY_POWER2 }, /* POWER */
 };
 
 static struct rc_map_list medion_x10_map = {