2 files changed, 4 insertions, 6 deletions

diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 34e83f0195..5ac85a3115 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -3,9 +3,8 @@
 /* For all targets */
 
 /* For various targets... */
-#if (CONFIG_KEYPAD == RECORDER_PAD) || \
-    (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-    defined(HAVE_LCD_COLOR)
+#if (CONFIG_KEYPAD == RECORDER_PAD) || defined(HAVE_LCD_COLOR) \
+ || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5)
 rockboy
 #endif
 
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index 40f68681d8..783accd01b 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -76,7 +76,7 @@ void ev_poll(void)
     released = ~newbuttonstate & oldbuttonstate;
     pressed = newbuttonstate & ~oldbuttonstate;
     oldbuttonstate = newbuttonstate;
-#if CONFIG_KEYPAD == IRIVER_H100_PAD
+#if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2)
     if (rb->button_hold()&~holdbutton)
         fb.mode=(fb.mode+1)%4;
     holdbutton=rb->button_hold();
@@ -161,8 +161,7 @@ void ev_poll(void)
 #else
         if(pressed & options.MENU) {
 #endif
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-    defined(HAVE_LCD_COLOR)
+#if (CONFIG_KEYPAD != RECORDER_PAD)
 #ifdef HAVE_WHEEL_POSITION
             rb->wheel_send_events(true);
 #endif