diff --git a/android/wscript b/android/wscript
index 833476b3..d59cfef6 100644
--- a/android/wscript
+++ b/android/wscript
@@ -18,7 +18,7 @@ def build(bld):
 		srcdir = 'src',
 		compat = '1.6',
 		name = 'xashdroid-src',
-#		jni = 'lib',
+		jni = 'lib',
 		debug = bld.env.D8_DEBUG,
 		target_api = 19)
 	return
diff --git a/compile.sh b/compile.sh
index 9e23dffb..e1b8868b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -6,13 +6,13 @@ if echo "$HOME" | grep "com.termux"; then
 	export JAVA=true # /bin/true does nothing but returns success
 	export JAR=true
 	export JAVADOC=true
-	# export AAPT2=aapt
 	TERMUX_ARG="--termux"
+	TOOLCHAIN=host
 else
 	echo "-- Configuring for Android SDK/NDK"
-	ARCHS="armeabi-v7a armeabi x86"
+	TOOLCHAIN=4.9
 fi
-TOOLCHAIN=4.9
+ARCHS="armeabi-v7a armeabi x86"
 API=9
 ROOT="$PWD" # compile.sh must be run from root of android project sources
 SUBDIRS="xash3d-fwgs hlsdk-xash3d"
@@ -54,11 +54,11 @@ build_native_project()
 }
 
 # Do it inside waf?
-#for i in $ARCHS; do
-#	for j in $SUBDIRS; do
-#		build_native_project "$j" "$i" "$TOOLCHAIN" "$API"
-#	done
-#done
+for i in $ARCHS; do
+	for j in $SUBDIRS; do
+		build_native_project "$j" "$i" "$TOOLCHAIN" "$API"
+	done
+done
 
 # Run waf
 ./waf build -v|| exit 1
diff --git a/hlsdk-xash3d b/hlsdk-xash3d
index 745d722a..6143c74d 160000
--- a/hlsdk-xash3d
+++ b/hlsdk-xash3d
@@ -1 +1 @@
-Subproject commit 745d722a5a8bd1811596778a57dd3a8de4acf468
+Subproject commit 6143c74dc9ec26016767976f2d606979490b5728
diff --git a/xash3d-fwgs b/xash3d-fwgs
index ba69f9e6..d1ac48b2 160000
--- a/xash3d-fwgs
+++ b/xash3d-fwgs
@@ -1 +1 @@
-Subproject commit ba69f9e62a927b8538397a0d3a90be352ddb471b
+Subproject commit d1ac48b2a11f633f491fa89fb67af9182438ecb6