--- dvb/linux/drivers/media/rc/keymaps/rc-imon-pad.c	2011-11-24 05:45:52.000000000 +0100
+++ dvb/linux/drivers/media/rc/keymaps/rc-imon-pad-new.c	2012-10-02 21:11:34.980304819 +0200
@@ -43,15 +43,15 @@
 	{ 0x29a515b7, KEY_LEFT },
 	{ 0x2ba515b7, KEY_RIGHT },
 
-	{ 0x0200002c, KEY_SPACE }, /* Select/Space */
-	{ 0x2a9315b7, KEY_SPACE }, /* Select/Space */
-	{ 0x02000028, KEY_ENTER },
-	{ 0x28a195b7, KEY_ENTER },
-	{ 0x288195b7, KEY_EXIT },
-	{ 0x02000029, KEY_ESC },
-	{ 0x2bb715b7, KEY_ESC },
-	{ 0x0200002a, KEY_BACKSPACE },
-	{ 0x28a115b7, KEY_BACKSPACE },
+	{ 0x0200002c, KEY_INFO }, /* Select/Space */
+	{ 0x2a9315b7, KEY_INFO }, /* Select/Space */
+	{ 0x02000028, KEY_OK },
+	{ 0x28a195b7, KEY_OK },
+	{ 0x288195b7, KEY_PROG1 }, /* App Exit */
+	{ 0x02000029, KEY_BACK },
+	{ 0x2bb715b7, KEY_BACK },
+	{ 0x0200002a, KEY_ESC }, /* Backspace */
+	{ 0x28a115b7, KEY_ESC }, /* Backspace */
 
 	{ 0x2b9595b7, KEY_MUTE },
 	{ 0x28a395b7, KEY_VOLUMEUP },
@@ -59,75 +59,75 @@
 	{ 0x289395b7, KEY_CHANNELUP },
 	{ 0x288795b7, KEY_CHANNELDOWN },
 
-	{ 0x0200001e, KEY_NUMERIC_1 },
-	{ 0x0200001f, KEY_NUMERIC_2 },
-	{ 0x02000020, KEY_NUMERIC_3 },
-	{ 0x02000021, KEY_NUMERIC_4 },
-	{ 0x02000022, KEY_NUMERIC_5 },
-	{ 0x02000023, KEY_NUMERIC_6 },
-	{ 0x02000024, KEY_NUMERIC_7 },
-	{ 0x02000025, KEY_NUMERIC_8 },
-	{ 0x02000026, KEY_NUMERIC_9 },
-	{ 0x02000027, KEY_NUMERIC_0 },
-
-	{ 0x28b595b7, KEY_NUMERIC_1 },
-	{ 0x2bb195b7, KEY_NUMERIC_2 },
-	{ 0x28b195b7, KEY_NUMERIC_3 },
-	{ 0x2a8595b7, KEY_NUMERIC_4 },
-	{ 0x299595b7, KEY_NUMERIC_5 },
-	{ 0x2aa595b7, KEY_NUMERIC_6 },
-	{ 0x2b9395b7, KEY_NUMERIC_7 },
-	{ 0x2a8515b7, KEY_NUMERIC_8 },
-	{ 0x2aa115b7, KEY_NUMERIC_9 },
-	{ 0x2ba595b7, KEY_NUMERIC_0 },
-
-	{ 0x02200025, KEY_NUMERIC_STAR },
-	{ 0x28b515b7, KEY_NUMERIC_STAR },
-	{ 0x02200020, KEY_NUMERIC_POUND },
-	{ 0x29a115b7, KEY_NUMERIC_POUND },
-
-	{ 0x2b8515b7, KEY_VIDEO },
-	{ 0x299195b7, KEY_AUDIO },
-	{ 0x2ba115b7, KEY_IMAGES },
-	{ 0x28a515b7, KEY_TV },
-	{ 0x29a395b7, KEY_DVD },
-	{ 0x29a295b7, KEY_DVD },
+	{ 0x0200001e, KEY_1 },
+	{ 0x0200001f, KEY_2 },
+	{ 0x02000020, KEY_3 },
+	{ 0x02000021, KEY_4 },
+	{ 0x02000022, KEY_5 },
+	{ 0x02000023, KEY_6 },
+	{ 0x02000024, KEY_7 },
+	{ 0x02000025, KEY_8 },
+	{ 0x02000026, KEY_9 },
+	{ 0x02000027, KEY_0 },
+
+	{ 0x28b595b7, KEY_1 },
+	{ 0x2bb195b7, KEY_2 },
+	{ 0x28b195b7, KEY_3 },
+	{ 0x2a8595b7, KEY_4 },
+	{ 0x299595b7, KEY_5 },
+	{ 0x2aa595b7, KEY_6 },
+	{ 0x2b9395b7, KEY_7 },
+	{ 0x2a8515b7, KEY_8 },
+	{ 0x2aa115b7, KEY_9 },
+	{ 0x2ba595b7, KEY_0 },
+
+	{ 0x02200025, KEY_VIDEO }, /* Star */
+	{ 0x28b515b7, KEY_VIDEO }, /* Star */
+	{ 0x02200020, KEY_IMAGES }, /* Pound */
+	{ 0x29a115b7, KEY_IMAGES }, /* Pound */
+
+	{ 0x2b8515b7, KEY_RED }, /* Video */
+	{ 0x299195b7, KEY_GREEN }, /* Music */
+	{ 0x2ba115b7, KEY_BLUE }, /* Pictures */
+	{ 0x28a515b7, KEY_YELLOW }, /* TV */
+	{ 0x29a395b7, KEY_TEXT }, /* DVD */
+	{ 0x29a295b7, KEY_TEXT }, /* DVD */
 
 	/* the Menu key between DVD and Subtitle on the RM-200... */
 	{ 0x2ba385b7, KEY_MENU },
 	{ 0x2ba395b7, KEY_MENU },
 
-	{ 0x288515b7, KEY_BOOKMARKS },
-	{ 0x2ab715b7, KEY_CAMERA }, /* Thumbnail */
+	{ 0x288515b7, KEY_SETUP }, /* Bookmarks */
+	{ 0x2ab715b7, KEY_FAVORITES }, /* Thumbnail */
 	{ 0x298595b7, KEY_SUBTITLE },
-	{ 0x2b8595b7, KEY_LANGUAGE },
+	{ 0x2b8595b7, KEY_MODE }, /* Audio */
 
-	{ 0x29a595b7, KEY_ZOOM },
-	{ 0x2aa395b7, KEY_SCREEN }, /* FullScreen */
+	{ 0x29a595b7, KEY_FN }, /* Zoom */
+	{ 0x2aa395b7, KEY_SCREEN }, /* Full Screen */
 
-	{ 0x299115b7, KEY_KEYBOARD },
-	{ 0x299135b7, KEY_KEYBOARD },
+	{ 0x299115b7, KEY_KEYBOARD }, /* Mouse/Keyboard */
+	{ 0x299135b7, KEY_KEYBOARD }, /* Mouse/Keyboard */
 
-	{ 0x01010000, BTN_LEFT },
-	{ 0x01020000, BTN_RIGHT },
-	{ 0x01010080, BTN_LEFT },
-	{ 0x01020080, BTN_RIGHT },
-	{ 0x688301b7, BTN_LEFT },
-	{ 0x688481b7, BTN_RIGHT },
+	{ 0x01010000, BTN_LEFT }, /* Mouse left Klick */
+	{ 0x01020000, BTN_RIGHT }, /* Mouse right Klick */
+	{ 0x01010080, BTN_LEFT }, /* Mouse left Klick */
+	{ 0x01020080, BTN_RIGHT }, /* Mouse right Klick */
+	{ 0x688301b7, BTN_LEFT }, /* Mouse left Klick */
+	{ 0x688481b7, BTN_RIGHT }, /* Mouse right Klick */
 
-	{ 0x2a9395b7, KEY_CYCLEWINDOWS }, /* TaskSwitcher */
+	{ 0x2a9395b7, KEY_CHANNEL }, /* Task Switcher */
 	{ 0x2b8395b7, KEY_TIME }, /* Timer */
 
-	{ 0x289115b7, KEY_POWER },
-	{ 0x29b195b7, KEY_EJECTCD }, /* the one next to play */
-	{ 0x299395b7, KEY_EJECTCLOSECD }, /* eject (by TaskSw) */
-
-	{ 0x02800000, KEY_CONTEXT_MENU }, /* Left Menu */
-	{ 0x2b8195b7, KEY_CONTEXT_MENU }, /* Left Menu*/
-	{ 0x02000065, KEY_COMPOSE }, /* RightMenu */
-	{ 0x28b715b7, KEY_COMPOSE }, /* RightMenu */
-	{ 0x2ab195b7, KEY_MEDIA }, /* Go or MultiMon */
-	{ 0x29b715b7, KEY_DASHBOARD }, /* AppLauncher */
+	{ 0x289115b7, KEY_POWER2 },
+	{ 0x29b195b7, KEY_PROG2 }, /* Eject (the one next to play) */
+	{ 0x299395b7, KEY_AUDIO }, /* Eject (by TaskSw) */
+
+	{ 0x02800000, KEY_PROG3 }, /* Left Menu */
+	{ 0x2b8195b7, KEY_PROG3 }, /* Left Menu*/
+	{ 0x02000065, KEY_PROG4 }, /* Right Menu */
+	{ 0x28b715b7, KEY_PROG4 }, /* Right Menu */
+	{ 0x2ab195b7, KEY_EPG }, /* Go or MultiMon */
+	{ 0x29b715b7, KEY_PVR }, /* App Launcher */
 };
 
 static struct rc_map_list imon_pad_map = {