diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
index 4d50f65a3..d18a326ce 100644
--- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
@@ -1,16 +1,16 @@
 # The application settings for Android libSDL port
 
 # Specify application name (e.x. My Application)
-AppName="Debian xx"
+AppName="Debian"
 
 # Specify reversed site name of application (e.x. com.mysite.myapp)
 AppFullName=com.cuntubuntu.xx
 
 # Application version code (integer)
-AppVersionCode=150627
+AppVersionCode=150828
 
 # Application user-visible version name (string)
-AppVersionName="15.06.27"
+AppVersionName="15.08.28"
 
 # 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
@@ -21,10 +21,10 @@ AppVersionName="15.06.27"
 AppDataDownloadUrl="!!Data files|:data.tar.xz:obb:main.150626|:data.tar.xz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/jessie/dist-debian-jessie.tar.xz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!Update 1|:update1.tar.gz:update1-<ARCH>.tgz"
 
 # Reset SDL config when updating application to the new version (y) / (n)
-ResetSdlConfigForThisVersion=y
+ResetSdlConfigForThisVersion=n
 
 # Delete application data files when upgrading (specify file/dir paths separated by spaces)
-DeleteFilesOnUpgrade="postinstall.sh libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-2.flag libsdl-DownloadFinished-3.flag libsdl-DownloadFinished-4.flag libsdl-DownloadFinished-5.flag libsdl-DownloadFinished-6.flag libsdl-DownloadFinished-7.flag libsdl-DownloadFinished-8.flag libsdl-DownloadFinished-9.flag libsdl-DownloadFinished-10.flag libsdl-DownloadFinished-11.flag libsdl-DownloadFinished-12.flag libsdl-DownloadFinished-13.flag libsdl-DownloadFinished-14.flag libsdl-DownloadFinished-15.flag"
+DeleteFilesOnUpgrade="%"
 
 # Here you may type readme text, which will be shown during startup. Format is:
 # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/
diff --git a/project/jni/application/xserver-debian/AndroidData/postinstall.sh b/project/jni/application/xserver-debian/AndroidData/postinstall.sh
index 18743f376..8903ef354 100755
--- a/project/jni/application/xserver-debian/AndroidData/postinstall.sh
+++ b/project/jni/application/xserver-debian/AndroidData/postinstall.sh
@@ -5,6 +5,32 @@ cd $SECURE_STORAGE_DIR
 ./busybox tar xzf $UNSECURE_STORAGE_DIR/data-1.tar.gz
 rm -f $UNSECURE_STORAGE_DIR/data-1.tar.gz
 ARCH=`getprop ro.product.cpu.abi`
+echo "Detected architecture $ARCH"
+# We only support armeabi-v7a and x86
+case $ARCH in
+	armeabi-v7a)
+		;;
+	x86)
+		;;
+	arm64-v8a)
+		ARCH=armeabi-v7a
+		;;
+	arm64_v8a)
+		ARCH=armeabi-v7a
+		;;
+	x86_64)
+		ARCH=x86
+		;;
+	x86-64)
+		ARCH=x86
+		;;
+	*)
+		echo "=== ERROR ERROR ERROR ==="
+		echo "Unsupported architecture: $ARCH"
+		sleep 10000
+		exit 1
+		;;
+esac
 echo "Copying files for architecture $ARCH"
 ./busybox cp -af img-$ARCH/. img/
 echo "Removing files for other architectures"
diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
index 7139a9dda..ae34bded9 100644
--- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg
@@ -7,10 +7,10 @@ AppName="GIMP Inkscape"
 AppFullName=org.gimp.inkscape
 
 # Application version code (integer)
-AppVersionCode=281424
+AppVersionCode=281425
 
 # Application user-visible version name (string)
-AppVersionName="2.8.14.24"
+AppVersionName="2.8.14.25"
 
 # 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