4 files changed, 11 insertions, 4 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 9b29605a83..38192316a6 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -162,4 +162,6 @@ keymaps/keymap-c200.c
 keymaps/keymap-av300.c
 #elif CONFIG_KEYPAD == MROBE500_PAD
 keymaps/keymap-mr500.c
+#elif CONFIG_KEYPAD == MROBE100_PAD
+keymaps/keymap-mr100.c
 #endif
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES
index 88b60e0654..a64c209672 100644
--- a/apps/bitmaps/native/SOURCES
+++ b/apps/bitmaps/native/SOURCES
@@ -2,7 +2,11 @@
 
 /* Rockbox logo */
 #if (LCD_DEPTH == 1)
+#if (LCD_WIDTH == 160)
+rockboxlogo.160x53x1.bmp
+#else
 rockboxlogo.112x30x1.bmp
+#endif
 #elif (LCD_WIDTH == 128) && (LCD_DEPTH == 16)
 rockboxlogo.128x40x16.bmp
 #elif (LCD_WIDTH == 132) && (LCD_DEPTH == 16)
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 8f24ac95f6..f5dbbf17a5 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -983,7 +983,8 @@ static bool dbg_spdif(void)
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
 #   define DEBUG_CANCEL  BUTTON_REC
 
-#elif CONFIG_KEYPAD == IRIVER_H10_PAD
+#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) || \
+      (CONFIG_KEYPAD == MROBE100_PAD)
 #   define DEBUG_CANCEL  BUTTON_REW
 
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 34eaed5343..3e918ff62e 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3888,17 +3888,17 @@
   <source>
     *: none
     e200: "Wheel Light Timeout"
-    c200,gigabeatf: "Button Light Timeout"
+    c200,gigabeatf,mrobe100: "Button Light Timeout"
   </source>
   <dest>
     *: none
     e200: "Wheel Light Timeout"
-    c200,gigabeatf: "Button Light Timeout"
+    c200,gigabeatf,mrobe100: "Button Light Timeout"
   </dest>
   <voice>
     *: none
     e200: "Wheel Light Timeout"
-    c200,gigabeatf: "Button Light Timeout"
+    c200,gigabeatf,mrobe100: "Button Light Timeout"
   </voice>
 </phrase>
 <phrase>