diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 6d08abb45..f5650506c 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -1091,6 +1091,8 @@ rm -rf project/obj/local/*/objs*/sdl_*
 rm -rf project/obj/local/*/objs*/lzma/src/XZInputStream.o
 rm -rf project/obj/local/*/objs*/liblzma.so
 
+rm -rf project/jni/application/src/AndroidData/lib
+
 rm -rf project/bin/classes
 rm -rf project/bin/res
 rm -rf project/app/build
diff --git a/project/jni/application/xserver/AndroidBuild.sh b/project/jni/application/xserver/AndroidBuild.sh
index a6ac50adc..a1653145e 100755
--- a/project/jni/application/xserver/AndroidBuild.sh
+++ b/project/jni/application/xserver/AndroidBuild.sh
@@ -76,6 +76,8 @@ 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/xserver/data/busybox-$1 ./libbusybox
+cp -f $CURDIR/xserver/data/busybox-$1 ./libbusybox.so
 for f in xhost xkbcomp xloadimage xsel; do cp -f $CURDIR/xserver/android/$1/$f ./$f ; done
 # Statically-linked prebuilt executables, generated using Debian chroot.
 
@@ -86,7 +88,7 @@ cp -f $CURDIR/pulseaudio/$1/install/lib/pulse-*/modules/*.so ./
 cp -f $CURDIR/pulseaudio/$1/*/install/lib/*.so ./
 
 rm -f ../AndroidData/binaries-$1.zip
-rm -rf ../AndroidData/lib
+rm -rf ../AndroidData/lib/$1
 mkdir -p ../AndroidData/lib/$1
 cp -a . ../AndroidData/lib/$1
 
diff --git a/project/jni/application/xserver/main.c b/project/jni/application/xserver/main.c
index 746db4793..dbca4d110 100644
--- a/project/jni/application/xserver/main.c
+++ b/project/jni/application/xserver/main.c
@@ -173,6 +173,30 @@ int main( int argc, char* argv[] )
 	__android_log_print(ANDROID_LOG_INFO, "XSDL", "XSDL chdir to: %s", getenv("SECURE_STORAGE_DIR"));
 	chdir( getenv("SECURE_STORAGE_DIR") ); // Megahack: change /proc/self/cwd to the X.org data dir, and use /proc/self/cwd path in libX11
 
+	system("logwrapper echo =====================");
+	system("logwrapper ls -l .");
+	system("logwrapper echo ===================== usr");
+	system("logwrapper ls -l usr");
+	system("logwrapper echo ===================== usr/bin");
+	system("logwrapper ls -l usr/bin");
+	system("logwrapper echo ===================== usr/share/X11/xkb/rules");
+	system("logwrapper ls -l usr/share/X11/xkb/rules");
+	system("logwrapper echo ===================== ./busybox");
+	system("logwrapper ./busybox ls -l");
+	system("logwrapper ./busybox");
+	system("logwrapper ./busybox tar -h");
+	{
+		char buf[PATH_MAX];
+		system("logwrapper echo ===================== LIBDIR = $LIBDIR");
+		sprintf(buf, "logwrapper ls -l %s", getenv("LIBDIR"));
+		system(buf);
+		sprintf(buf, "logwrapper %s/busybox", getenv("LIBDIR"));
+		system(buf);
+		sprintf(buf, "logwrapper %s/busybox tar -h", getenv("LIBDIR"));
+		system(buf);
+	}
+	system("logwrapper echo ===================== END");
+
 	startPulseAudio();
 
 	android_main( argnum, args, envp ); // Should never exit on success, if we want to terminate we kill ourselves