diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index f17ddfd..3322df5 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -642,9 +642,11 @@
 	/* Check if we should do something other than booting up */
 	if (keys_get_state(KEY_HOME) != 0)
 		boot_into_recovery = 1;
+	if (keys_get_state(KEY_VOLUMEUP) != 0)
+		boot_into_recovery = 1;
 	if (keys_get_state(KEY_BACK) != 0)
 		goto fastboot;
-	if (keys_get_state(KEY_CLEAR) != 0)
+	if (keys_get_state(KEY_VOLUMEDOWN) != 0)
 		goto fastboot;
 
 	#if NO_KEYPAD_DRIVER
diff --git a/target/msm7630_1x/keypad.c b/target/msm7630_1x/keypad.c
index 7261126..46c51c8 100644
--- a/target/msm7630_1x/keypad.c
+++ b/target/msm7630_1x/keypad.c
@@ -44,7 +44,8 @@
 static unsigned int qwerty_keymap[] = {
     [KEYMAP_INDEX(4, 2)] = KEY_BACK,          /* -L on SURF & FFA */
     [KEYMAP_INDEX(3, 4)] = KEY_HOME,          /* +R on SURF & FFA */
-    [KEYMAP_INDEX(1, 4)] = KEY_CLEAR,         /* '-' of left side switch on FLUID */
+    [KEYMAP_INDEX(1, 3)] = KEY_VOLUMEUP,      /* '+' of left side switch on FLUID */
+    [KEYMAP_INDEX(1, 4)] = KEY_VOLUMEDOWN,    /* '-' of left side switch on FLUID */
 };
 
 static struct qwerty_keypad_info qwerty_keypad = {
diff --git a/target/msm7630_surf/keypad.c b/target/msm7630_surf/keypad.c
index 7261126..46c51c8 100644
--- a/target/msm7630_surf/keypad.c
+++ b/target/msm7630_surf/keypad.c
@@ -44,7 +44,8 @@
 static unsigned int qwerty_keymap[] = {
     [KEYMAP_INDEX(4, 2)] = KEY_BACK,          /* -L on SURF & FFA */
     [KEYMAP_INDEX(3, 4)] = KEY_HOME,          /* +R on SURF & FFA */
-    [KEYMAP_INDEX(1, 4)] = KEY_CLEAR,         /* '-' of left side switch on FLUID */
+    [KEYMAP_INDEX(1, 3)] = KEY_VOLUMEUP,      /* '+' of left side switch on FLUID */
+    [KEYMAP_INDEX(1, 4)] = KEY_VOLUMEDOWN,    /* '-' of left side switch on FLUID */
 };
 
 static struct qwerty_keypad_info qwerty_keypad = {