2 files changed, 13 insertions, 3 deletions

diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 4074177ce2..414ae46123 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -57,9 +57,9 @@ zxbox
 pacbox
 #endif
 
-#if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \
-    (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)) && (MEMORYSIZE > 2) && \
-    !defined(RB_PROFILE)
+#if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || defined(SANSA_CLIPPLUS) \
+    || defined(SANSA_CLIPV2) || (LCD_DEPTH == 2)) \
+    && (MEMORYSIZE > 2 && !defined(RB_PROFILE))
 doom
 #endif
 
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index dc0374f852..e7f8e9014b 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -222,6 +222,16 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ESC     BUTTON_POWER
 #define DOOMBUTTON_ENTER   BUTTON_SELECT
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
+#define DOOMBUTTON_UP      BUTTON_UP
+#define DOOMBUTTON_DOWN    BUTTON_DOWN
+#define DOOMBUTTON_LEFT    BUTTON_LEFT
+#define DOOMBUTTON_RIGHT   BUTTON_RIGHT
+#define DOOMBUTTON_SHOOT   BUTTON_SELECT
+#define DOOMBUTTON_OPEN    BUTTON_HOME
+#define DOOMBUTTON_ESC     BUTTON_POWER
+#define DOOMBUTTON_ENTER   BUTTON_SELECT
+#define DOOMBUTTON_WEAPON  BUTTON_VOL_UP
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN