diff --git a/project/jni/application/hid-pc-keyboard/src b/project/jni/application/hid-pc-keyboard/src
index 9de0e48c2..e9b01beb1 160000
--- a/project/jni/application/hid-pc-keyboard/src
+++ b/project/jni/application/hid-pc-keyboard/src
@@ -1 +1 @@
-Subproject commit 9de0e48c2886962a8527c5f009a6ca99fcc289b8
+Subproject commit e9b01beb1a0b421b2cb5ac6501d56ea54f0ef2bd
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
index 47112659a..7a97db502 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.h
@@ -84,8 +84,8 @@ typedef SDL_Keysym SDL_keysym;
 #define NUMLOCKCLEAR NUMLOCK
 #define GRAVE BACKQUOTE
 #define APOSTROPHE QUOTE
-#define LGUI LMETA
-#define RGUI RMETA
+#define LGUI LSUPER
+#define RGUI RSUPER
 #define SCROLLLOCK SCROLLOCK
 // Overkill haha
 #define A a
diff --git a/project/jni/sdl-1.2/src/video/android/keymap.c b/project/jni/sdl-1.2/src/video/android/keymap.c
index 428654cb7..a96b3366c 100644
--- a/project/jni/sdl-1.2/src/video/android/keymap.c
+++ b/project/jni/sdl-1.2/src/video/android/keymap.c
@@ -151,8 +151,8 @@ void SDL_android_init_keymap(SDLKey *SDL_android_keymap)
   keymap[KEYCODE_CTRL_RIGHT] = SDL_KEY(RCTRL);
   keymap[KEYCODE_CAPS_LOCK] = SDL_KEY(CAPSLOCK);
   keymap[KEYCODE_SCROLL_LOCK] = SDL_KEY(SCROLLLOCK);
-  keymap[KEYCODE_META_LEFT] = SDL_KEY(LEFT);
-  keymap[KEYCODE_META_RIGHT] = SDL_KEY(RIGHT);
+  keymap[KEYCODE_META_LEFT] = SDL_KEY(LGUI);
+  keymap[KEYCODE_META_RIGHT] = SDL_KEY(RGUI);
   keymap[KEYCODE_FUNCTION] = SDL_KEY(RGUI);
   keymap[KEYCODE_SYSRQ] = SDL_KEY(SYSREQ);
   keymap[KEYCODE_BREAK] = SDL_KEY(PAUSE);
diff --git a/project/jni/sdl-2.0/include/SDL_revision.h.orig b/project/jni/sdl-2.0/include/SDL_revision.h.orig
deleted file mode 100644
index 2d57530ee..000000000
--- a/project/jni/sdl-2.0/include/SDL_revision.h.orig
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SDL_REVISION "hg-7633:d6a8fa507a45"
-#define SDL_REVISION_NUMBER 7633
diff --git a/project/jni/sdl-2.0/include/SDL_revision.h.rej b/project/jni/sdl-2.0/include/SDL_revision.h.rej
deleted file mode 100644
index 995401fa0..000000000
--- a/project/jni/sdl-2.0/include/SDL_revision.h.rej
+++ /dev/null
@@ -1,7 +0,0 @@
---- include/SDL_revision.h	2013-10-08 17:44:55.820345791 +0200
-+++ include/SDL_revision.h	2013-10-08 15:37:33.543284000 +0200
-@@ -1,2 +1,2 @@
--#define SDL_REVISION "hg-0:aaaaaaaaaaah"
--#define SDL_REVISION_NUMBER 0
-+#define SDL_REVISION "hg-6305:601b0e251822"
-+#define SDL_REVISION_NUMBER 6305