diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 687cdf8ab..c98bcf9ee 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 687cdf8ab7e312bac6f5a9d77e31095c050b8a34
+Subproject commit c98bcf9eea63c3d875b55a0ca922a44b0a2ac0c8
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index dc740d594..8ffdaa479 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit dc740d594f429924d82815b08b68f449a5a233a6
+Subproject commit 8ffdaa479dd5b9d1a86057c84801daac1ca412dd
diff --git a/project/jni/jpeg/Android.mk b/project/jni/jpeg/Android.mk
index 651de84fa..809bd517b 100644
--- a/project/jni/jpeg/Android.mk
+++ b/project/jni/jpeg/Android.mk
@@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_ARM_MODE := arm
+ANDROID_JPEG_NO_ASSEMBLER := true # It is broken in NDK r8c
 
 LOCAL_SRC_FILES := \
 	jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c \