diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index f8c555a407..858424fbe5 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -34,10 +34,17 @@ struct DefMappingStruct {
 KeyMapping g_controllerMap;
 
 static const DefMappingStruct defaultKeyboardKeyMap[] = {
+#ifdef BLACKBERRY
+	{CTRL_SQUARE, NKCODE_J},
+	{CTRL_TRIANGLE, NKCODE_I},
+	{CTRL_CIRCLE, NKCODE_L},
+	{CTRL_CROSS, NKCODE_K},
+#else
 	{CTRL_SQUARE, NKCODE_A},
 	{CTRL_TRIANGLE, NKCODE_S},
 	{CTRL_CIRCLE, NKCODE_X},
 	{CTRL_CROSS, NKCODE_Z},
+#endif
 	{CTRL_LTRIGGER, NKCODE_Q},
 	{CTRL_RTRIGGER, NKCODE_W},
 
@@ -47,6 +54,16 @@ static const DefMappingStruct defaultKeyboardKeyMap[] = {
 #else
 	{CTRL_SELECT, NKCODE_ENTER},
 #endif
+#ifdef BLACKBERRY
+	{CTRL_UP   , NKCODE_W},
+	{CTRL_DOWN , NKCODE_S},
+	{CTRL_LEFT , NKCODE_A},
+	{CTRL_RIGHT, NKCODE_D},
+	{VIRTKEY_AXIS_Y_MAX, NKCODE_W},
+	{VIRTKEY_AXIS_Y_MIN, NKCODE_S},
+	{VIRTKEY_AXIS_X_MIN, NKCODE_A},
+	{VIRTKEY_AXIS_X_MAX, NKCODE_D},
+#else
 	{CTRL_UP   , NKCODE_DPAD_UP},
 	{CTRL_DOWN , NKCODE_DPAD_DOWN},
 	{CTRL_LEFT , NKCODE_DPAD_LEFT},
@@ -55,6 +72,7 @@ static const DefMappingStruct defaultKeyboardKeyMap[] = {
 	{VIRTKEY_AXIS_Y_MIN, NKCODE_K},
 	{VIRTKEY_AXIS_X_MIN, NKCODE_J},
 	{VIRTKEY_AXIS_X_MAX, NKCODE_L},
+#endif
 	{VIRTKEY_RAPID_FIRE  , NKCODE_SHIFT_LEFT},
 	{VIRTKEY_UNTHROTTLE  , NKCODE_TAB},
 	{VIRTKEY_SPEED_TOGGLE, NKCODE_GRAVE},
@@ -106,7 +124,7 @@ static const DefMappingStruct defaultShieldKeyMap[] = {
 };
 
 static const DefMappingStruct defaultPadMap[] = {
-#ifdef ANDROID
+#if defined(ANDROID) || defined(BLACKBERRY)
 	{CTRL_CROSS          , NKCODE_BUTTON_A},
 	{CTRL_CIRCLE         , NKCODE_BUTTON_B},
 	{CTRL_SQUARE         , NKCODE_BUTTON_X},
diff --git a/native b/native
index dd01ff5d96..b8b4add222 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit dd01ff5d9688d54555090d652ca6fae570217356
+Subproject commit b8b4add22254942fbb2174cfae2371835c2954bb