diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index 799859db3..85df9c397 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit 799859db334e51a6c7982855828a3596dd785ca0
+Subproject commit 85df9c3978b945917e93f71c29c5ac56c14edfc4
diff --git a/project/jni/application/openttd/src b/project/jni/application/openttd/src
index f45c5eaaf..248b1a2c7 160000
--- a/project/jni/application/openttd/src
+++ b/project/jni/application/openttd/src
@@ -1 +1 @@
-Subproject commit f45c5eaafa75ccde775562bb1550e6f89c5acedb
+Subproject commit 248b1a2c71cc084e78dcde86872de690f4886be8
diff --git a/project/jni/application/xrick/xrick-021212/include/config.h b/project/jni/application/xrick/xrick-021212/include/config.h
index 45b17d2ef..22862756a 100644
--- a/project/jni/application/xrick/xrick-021212/include/config.h
+++ b/project/jni/application/xrick/xrick-021212/include/config.h
@@ -22,7 +22,9 @@
 #undef GFXPC
 
 /* joystick support */
+#ifdef __ANDROID__
 #define ENABLE_JOYSTICK
+#endif
 
 /* sound support */
 #define ENABLE_SOUND
diff --git a/project/jni/application/xserver-debian/xserver b/project/jni/application/xserver-debian/xserver
index 3cce1acc1..38269b698 160000
--- a/project/jni/application/xserver-debian/xserver
+++ b/project/jni/application/xserver-debian/xserver
@@ -1 +1 @@
-Subproject commit 3cce1acc1f943ded8491e1be814aebfce6e09023
+Subproject commit 38269b6980bccef6340f9c9f04e6e3ec059d07b0
diff --git a/project/jni/boost/src b/project/jni/boost/src
index 82900d3d0..bc9ea9d30 160000
--- a/project/jni/boost/src
+++ b/project/jni/boost/src
@@ -1 +1 @@
-Subproject commit 82900d3d0e9638172f7d65d130ca75f810cefb48
+Subproject commit bc9ea9d3032eb1e2b095484e2052aa2bc2e91767
diff --git a/todo.txt b/todo.txt
index 915a483a2..8888f580a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -25,7 +25,7 @@ TODO, which will get actually done
 
 - XSDL: support Android intent x11://localhost:6000 - http://www.openintents.org/node/905
 
-- USB Keyboard: touchpad mode, configurable mouse speed, show keyboard LEDs, show error when root is not installed.
+- USB Keyboard: configurable mouse speed, show keyboard LEDs, redefine unknown keys.
 
 - S Planner Killer: options to restore calendar settiongs, and to kill lock-screen widget.