diff --git a/build.sh b/build.sh
index d71b3575e..42237e82d 100755
--- a/build.sh
+++ b/build.sh
@@ -27,6 +27,14 @@ if [ "$#" -gt 0 -a "$1" = "release" ]; then
 	build_release=true
 fi
 
+if [ "$#" -gt 0 -a "$1" = "-h" ]; then
+	echo "Usage: $0 [-s] [-i] [-r] [release]"
+	echo "    -s: sign APK file after building"
+	echo "    -i: install APK file to device after building"
+	echo "    -r: run APK file on device after building"
+	echo "    release: build release package instead of debug"
+fi
+
 [ -e project/local.properties ] || {
 	android update project -p project || exit 1
 	rm -f project/src/Globals.java
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index 078cbc2d5..1bcbadd1e 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit 078cbc2d52c2e4c5b37546445e9b686a4403908b
+Subproject commit 1bcbadd1eadd735235288463239c348f5b58f845
diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
index 815fb7e42..126cc5231 100644
--- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
@@ -87,7 +87,7 @@ AppNeedsTwoButtonMouse=y
 ShowMouseCursor=n
 
 # Users are complaining that the video output is slow, so screw pen precision
-GenerateSubframeTouchEvents=y
+GenerateSubframeTouchEvents=n
 
 # Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)
 ForceRelativeMouseMode=n
@@ -175,10 +175,10 @@ MultiABI=armeabi-v7a
 AppMinimumRAM=0
 
 # Application version code (integer)
-AppVersionCode=28205
+AppVersionCode=28206
 
 # Application user-visible version name (string)
-AppVersionName="2.8.2.05"
+AppVersionName="2.8.2.06"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=y
diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index de7789829..96e628554 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/project/jni/application/xserver/AndroidBuild.sh
@@ -7,10 +7,21 @@ PACKAGE_NAME=`grep AppFullName AndroidAppSettings.cfg | sed 's/.*=//'`
 ../setEnvironment-armeabi-v7a.sh sh -c '\
 $CC $CFLAGS -c main.c gfx.c' || exit 1
 
-[ -e xserver/android ] || git submodule update --init xserver || exit 1
+[ -e xserver/android ] || {
+	CURDIR=`pwd`
+	cd ../../../..
+	git submodule update --init project/jni/application/xserver/xserver || exit 1
+	cd $CURDIR
+} || exit 1
 cd xserver
 [ -e configure ] || autoreconf --force -v --install || exit 1
+[ -e android/android-shmem/LICENSE ] || git submodule update --init android/android-shmem || exit 1
 cd android
+[ -e android-shmem/libancillary/ancillary.h ] || {
+	cd android-shmem
+	git submodule update --init libancillary || exit 1
+	cd ..
+} || exit 1
 [ -e libfontenc-*/Makefile ] && {
 	grep "/data/data/$PACKAGE_NAME" libfontenc-*/Makefile || \
 	git clean -f -d -x .
diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c
index 720f362f3..3e5ad2450 100644
--- a/project/jni/application/xserver/gfx.c
+++ b/project/jni/application/xserver/gfx.c
@@ -394,7 +394,7 @@ void showErrorMessage(const char *msg)
 void XSDL_initSDL()
 {
 	SDL_Init(SDL_INIT_VIDEO);
-	SDL_SetVideoMode(VID_X, VID_Y, 24, SDL_SWSURFACE);
+	SDL_SetVideoMode(VID_X, VID_Y, 0, SDL_SWSURFACE);
 	TTF_Init();
 	sFont = TTF_OpenFont("DroidSansMono.ttf", 12);
 	if (!sFont)
diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c
index eed1131ce..e60988b6c 100644
--- a/project/jni/application/xserver/main.c
+++ b/project/jni/application/xserver/main.c
@@ -130,7 +130,7 @@ int main( int argc, char* argv[] )
 
 	XSDL_deinitSDL();
 
-	sprintf( screenres, "%d/%dx%d/%dx%d", resolutionW, displayW, resolutionH, displayH, 24 );
+	sprintf( screenres, "%d/%dx%d/%dx%d", resolutionW, displayW, resolutionH, displayH, SDL_GetVideoInfo()->vfmt->BitsPerPixel );
 
 	if( argc > 1 )
 	{
diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver
index 5018d4c6c..b4dd6771e 160000
--- a/project/jni/application/xserver/xserver
+++ b/project/jni/application/xserver/xserver
@@ -1 +1 @@
-Subproject commit 5018d4c6ccd7962e640941400802e8b9b6be4562
+Subproject commit b4dd6771eb3d6e2e9f062373776cb9a20b187949