diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
index 388d283c4..bcc1c395b 100644
--- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg
+++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg
@@ -20,7 +20,7 @@ AppVersionName="19.12.24"
 # 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="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!System overlay|:overlay.tar.xz:overlay-<ARCH>.tar.xz"
+AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Loading image|:loading.gif:loading.gif^!!System overlay|:overlay.tar.xz:overlay-<ARCH>.tar.xz"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=y
diff --git a/project/jni/application/xserver-debian/AndroidData/postinstall.sh b/project/jni/application/xserver-debian/AndroidData/postinstall.sh
index 51b218672..3abc22c2d 100755
--- a/project/jni/application/xserver-debian/AndroidData/postinstall.sh
+++ b/project/jni/application/xserver-debian/AndroidData/postinstall.sh
@@ -9,5 +9,15 @@ cd $SECURE_STORAGE_DIR
 echo "Extracting overlay data files"
 ./busybox tar xvJf $DATADIR/overlay.tar.xz
 cd $SECURE_STORAGE_DIR/img
+
 echo "Installation path: $SECURE_STORAGE_DIR/img"
-./postinstall.sh
+
+rm -f ./postinstall-img.sh ./proot.sh
+ln -s ../usr/bin/postinstall-img.sh .
+ln -s ../usr/bin/proot.sh .
+
+ls -l .
+
+echo "Running postinstall-img.sh:"
+
+./postinstall-img.sh
diff --git a/project/jni/application/xserver-debian/debian-image b/project/jni/application/xserver-debian/debian-image
index 542f8256a..036ec696c 160000
--- a/project/jni/application/xserver-debian/debian-image
+++ b/project/jni/application/xserver-debian/debian-image
@@ -1 +1 @@
-Subproject commit 542f8256ae540b058cf31e20a1875447f604c38b
+Subproject commit 036ec696c62e4bba2f9a78f647ca56dade67dd8d
diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index bf9f77e39..69c89a5b3 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/project/jni/application/xserver/AndroidBuild.sh
@@ -85,6 +85,9 @@ cp -f $CURDIR/pulseaudio/$1/install/lib/pulseaudio/*.so ./
 cp -f $CURDIR/pulseaudio/$1/install/lib/pulse-*/modules/*.so ./
 cp -f $CURDIR/pulseaudio/$1/*/install/lib/*.so ./
 cp -f $CURDIR/debian-image/proot-prebuilt/$1/* ./
+cp -f $CURDIR/debian-image/dist/proot.sh ./
+cp -f $CURDIR/debian-image/dist/postinstall-img.sh ./
+cp -f $CURDIR/AndroidData/postinstall.sh ./
 
 rm -f ../AndroidData/binaries-$1.zip
 rm -rf ../AndroidData/lib/$1
diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c
index e7fe2e6f5..94072bde0 100644
--- a/project/jni/application/xserver/gfx.c
+++ b/project/jni/application/xserver/gfx.c
@@ -196,33 +196,10 @@ static int unpackFiles(const char *archive, const char *script, const char *dele
 	strcat( fname, script );
 	if( stat( fname, &st ) != 0 )
 	{
-		strcpy( fname2, getenv("UNSECURE_STORAGE_DIR") );
-		strcat( fname2, "/" );
-		strcat( fname2, script );
-		if( stat( fname2, &st ) != 0 )
-		{
-			__android_log_print(ANDROID_LOG_INFO, "XSDL", "Cannot find postinstall script");
-			return 1;
-		}
-		else
-		{
-			strcpy( fname2, "cat " );
-			strcat( fname2, getenv("UNSECURE_STORAGE_DIR") );
-			strcat( fname2, "/" );
-			strcat( fname2, script );
-			strcat( fname2, " > " );
-			strcat( fname2, fname );
-			__android_log_print(ANDROID_LOG_INFO, "XSDL", "Copying postinstall script from SD card: %s", fname2);
-			system( fname2 );
-		}
+		__android_log_print(ANDROID_LOG_INFO, "XSDL", "Cannot find postinstall script");
+		return 1;
 	}
 
-	__android_log_print(ANDROID_LOG_INFO, "XSDL", "Setting executable permissions on postinstall script");
-
-	strcpy( fname2, "chmod 755 " );
-	strcat( fname2, fname );
-	system( fname2 );
-
 	__android_log_print(ANDROID_LOG_INFO, "XSDL", "Running postinstall scipt: %s", script);
 
 	fo = popen(fname, "r");
@@ -254,7 +231,7 @@ static void * unpackFilesThread(void * unused)
 {
 	const char *unpack[][4] =
 	{
-		{ "data.tar.gz", "postinstall.sh", "usr/lib/xorg/protocol.txt", "img img-* postinstall.sh update*.sh" },
+		{ "data.tar.gz", "usr/bin/postinstall.sh", "usr/lib/xorg/protocol.txt", "img img-* postinstall.sh update*.sh" },
 		{ "xfonts.tar.gz", "", "", "" },
 		{ "update1.tar.gz", "update1.sh", "", "" },
 		{ "update2.tar.gz", "update2.sh", "", "" },