diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8942943a..db506a1e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,7 +4,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="in.celest.xash3d.hl"
-	android:versionCode="528"
+	android:versionCode="531"
 	android:versionName="0.18.1"
 	android:installLocation="auto">
 
diff --git a/build.sh b/build.sh
index c7ba575f..4aabb31f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=0 V=0 XASH_SDL=0 -j 8 APP_CFLAGS="-w -Wl,--no-undefined" APP_LDFLAGS="-Wl,--no-undefined"
+sh gen-version.sh release sign
 sh gen-version.sh default-release
 rm assets/extras.pak 2>/dev/null
 python2 makepak.py xash-extras assets/extras.pak
 ant release
 jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../myks.keystore bin/xashdroid-release-unsigned.apk xashdroid
-rm bin/xashdroid-release.apk
-#/home/a1ba/.android/android-sdk-linux/build-tools/22.0.1/zipalign 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk
+/home/a1ba/.android/android-sdk-linux/build-tools/24.0.1/zipalign -f 4 bin/xashdroid-release-unsigned.apk bin/xashdroid-release.apk
diff --git a/gen-config.sh b/gen-config.sh
old mode 100644
new mode 100755
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index e1d76c8e..d82c2731 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit e1d76c8e990dae484cfc3950a4682778b683ef38
+Subproject commit d82c27313456b208d2e347e1fbe10e3d74fe1bf8
diff --git a/src/org/json b/src/org/json
index 4e8e24d4..c24be0e4 160000
--- a/src/org/json
+++ b/src/org/json
@@ -1 +1 @@
-Subproject commit 4e8e24d49de6e9fa1afeaa992a6b06272858b160
+Subproject commit c24be0e4ea1828fdfadc74df356025f6fb126c52