diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 57f53951..8942943a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="in.celest.xash3d.hl"
-	android:versionCode="500"
-	android:versionName="0.18"
+	android:versionCode="528"
+	android:versionName="0.18.1"
 	android:installLocation="auto">
 
 	<application android:label="@string/app_name"
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 1cc94f4c..578c499b 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 1cc94f4cbffdd29d323ca163392169734465e2f7
+Subproject commit 578c499baf26f8e4a29e2ac403f0d92b17607745
diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d
index 39662908..21317e7d 160000
--- a/jni/src/hlsdk-xash3d
+++ b/jni/src/hlsdk-xash3d
@@ -1 +1 @@
-Subproject commit 396629081c3d89cb9e89c1a69cb34b43b4fa01c5
+Subproject commit 21317e7da39a8c74b3690ccb4713e6e6d2ed2556
diff --git a/test/AndroidManifest.xml b/test/AndroidManifest.xml
index cd8b203d..d8538b29 100644
--- a/test/AndroidManifest.xml
+++ b/test/AndroidManifest.xml
@@ -5,7 +5,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="in.celest.xash3d.hl.test"
       android:versionCode="1"
-      android:versionName="0.18-beta"
+      android:versionName="0.18.1-beta"
       android:installLocation="auto">
 
     <!-- Create a Java class extending SDLActivity and place it in a
diff --git a/xash-extras b/xash-extras
index 5bd72a90..7baffa6a 160000
--- a/xash-extras
+++ b/xash-extras
@@ -1 +1 @@
-Subproject commit 5bd72a90a3fd3bf674a7de3d48cb5ca213e83cb1
+Subproject commit 7baffa6afd003454d9f35280f31feb49ab38997c