diff --git a/project/jni/application/xserver/AndroidAppSettings.cfg b/project/jni/application/xserver/AndroidAppSettings.cfg
index 9233ef354..57857c986 100644
--- a/project/jni/application/xserver/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver/AndroidAppSettings.cfg
@@ -20,7 +20,7 @@ AppVersionName="1.20.41"
 # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file
 # You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries
 # Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip
-AppDataDownloadUrl="!!Data files|:data.tar.gz:data-1.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^Additional fonts (90Mb)|:xfonts.tar.gz:http://sourceforge.net/projects/libsdl-android/files/apk/XServer-XSDL/xfonts.tgz/download"
+AppDataDownloadUrl="!!Data files|:data.tar.gz:data-1.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^Additional fonts (90Mb)|:xfonts.tar.gz:https://sourceforge.net/projects/libsdl-android/files/apk/XServer-XSDL/xfonts.tgz/download"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index f09b22b8c..9dd9e876f 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/project/jni/application/xserver/AndroidBuild.sh
@@ -78,15 +78,13 @@ rm -rf $CURDIR/tmp-$1
 mkdir -p $CURDIR/tmp-$1
 cd $CURDIR/tmp-$1
 cp -f $CURDIR/xserver/data/busybox-$1 ./busybox
-cp -f $CURDIR/ssh ./
-cp -f $CURDIR/sshpass ./
 mkdir -p usr/bin
 # Executables linked with NDK, which crash on Lollipop.
 for f in xhost xkbcomp xli xsel; do cp -f $CURDIR/xserver/android/$1/$f ./usr/bin/$f ; done
 # Statically-linked prebuilt executables, generated using Debian chroot.
 
-mkdir -p pulse
 if false; then # Disable PulseAudio for now
+mkdir -p pulse
 cp -f $CURDIR/pulseaudio/$1/install/bin/pulseaudio pulse/
 cp -f $CURDIR/pulseaudio/$1/install/lib/libpulse.so.0.18.2 pulse/libpulse.so.0
 #ln -sf libpulse.so.0.18.2 pulse/libpulse.so.0
@@ -96,8 +94,8 @@ cp -f $CURDIR/pulseaudio/$1/install/lib/pulseaudio/libpulsecommon-7.0.so pulse/
 for F in $CURDIR/pulseaudio/$1/install/lib/pulse-7.0/modules/*.so; do
 	cp -f $F pulse/
 done
-fi # Disable PulseAudio for now
 cp -f $CURDIR/pulseaudio/android-pulseaudio.conf pulse/pulseaudio.conf
+fi # Disable PulseAudio for now
 
 rm -f ../AndroidData/binaries-$1.zip
 zip -r ../AndroidData/binaries-$1.zip .
diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c
index 73c1e2418..d6a30e18c 100644
--- a/project/jni/application/xserver/gfx.c
+++ b/project/jni/application/xserver/gfx.c
@@ -796,7 +796,7 @@ void XSDL_generateBackground(const char * port, int showHelp, int resolutionW, i
 				sprintf (msg, "export PULSE_SERVER=tcp:%s:4712", saddr);
 				renderStringScaled(msg, 12 * resolutionH / VID_Y, resolutionW/2, y, 255, 255, 255, surf);
 				y += resolutionH * 15 / VID_Y;
-				sprintf (msg, "metacity & gimp");
+				sprintf (msg, "gnome-session & gimp");
 				renderStringScaled(msg, 12 * resolutionH / VID_Y, resolutionW/2, y, 255, 255, 255, surf);
 				y += resolutionH * 20 / VID_Y;
 			}
diff --git a/project/jni/application/xserver/xserver b/project/jni/application/xserver/xserver
index cbde3cb06..107b5eb20 160000
--- a/project/jni/application/xserver/xserver
+++ b/project/jni/application/xserver/xserver
@@ -1 +1 @@
-Subproject commit cbde3cb068126a165998a76fde4a4325064566f3
+Subproject commit 107b5eb209c46f34a3a328c1f9e919c745daa746