diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg
index 04f0aa8c6..7eb68c13f 100644
--- a/project/jni/application/xserver/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="XServer XSDL"
 AppFullName=x.org.server
 
 # Application version code (integer)
-AppVersionCode=11129
+AppVersionCode=11130
 
 # Application user-visible version name (string)
-AppVersionName="1.11.29"
+AppVersionName="1.11.30"
 
 # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...'
 # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu
diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index d2009b494..4c99965f4 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/project/jni/application/xserver/AndroidBuild.sh
@@ -81,6 +81,7 @@ rm -f ../AndroidData/binaries-$1.zip
 zip -r ../AndroidData/binaries-$1.zip .
 # Executables linked with NDK with -pie, which crash on pre-Lollipop.
 for f in xhost xkbcomp xli xsel; do rm ./usr/bin/$f ; cp $CURDIR/xserver/android/$1/pie/$f ./usr/bin/$f ; done
+cp $CURDIR/xserver/data/busybox-$1-pie ./busybox
 rm -f ../AndroidData/binaries-$1-pie.zip
 zip -r ../AndroidData/binaries-$1-pie.zip .
 
diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver
index 3dcb0bbc7..5177211f7 160000
--- a/project/jni/application/xserver/xserver
+++ b/project/jni/application/xserver/xserver
@@ -1 +1 @@
-Subproject commit 3dcb0bbc78fefd243862ea017c0045e3e4534ead
+Subproject commit 5177211f7bf8d67eb912f75c9dafdc63935d0b9b
diff --git a/todo.txt b/todo.txt
index d6660a630..2f2d4ede7 100644
--- a/todo.txt
+++ b/todo.txt
@@ -45,6 +45,6 @@ TODO, which will get actually done
 
 - SDL: add option for non-fullscreen non-immersive mode.
 
-- Debian and Gimp: fails to launch on Galaxy S6 and Note 4 with Android 5.0.2, Snapdragon variants.
+- Debian and Gimp: fails to launch on Galaxy S6 and Note 4 with Android 5.0.2, fixed busybox provided in XSDL.
 
 - UQM HD: add fonts from http://mosc-portal.bursa.ru/showthread.php?t=206 and switch back to joystick controls, set 4:3 aspect ratio as default.