diff --git a/project/jni/application/freetype-config b/project/jni/application/freetype-config
index a8f68bc27..f411ae5a5 100755
--- a/project/jni/application/freetype-config
+++ b/project/jni/application/freetype-config
@@ -13,10 +13,10 @@ LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 prefix=$LOCAL_PATH/../freetype
-exec_prefix=$LOCAL_PATH/../../obj/local/armeabi
+#exec_prefix=$LOCAL_PATH/../../obj/local/armeabi # Breaks armeabi-v7a build
 exec_prefix_set=no
 includedir=${prefix}/include
-libdir=${exec_prefix}/lib
+#libdir=${exec_prefix}/lib
 enable_shared=
 wl=-Wl,
 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -146,7 +146,7 @@ if test "$echo_libs" = "yes" ; then
   fi
   libs="-lfreetype  "
   if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
-    echo -L$libdir $rpath $libs
+    echo $rpath $libs #-L$libdir
   else
     echo $libs
   fi
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 5c6bfe3c1..8e5c2bbce 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 5c6bfe3c1eb50fbf775a0bb459f09b6a38d0d4be
+Subproject commit 8e5c2bbce310547036f47661ce164fcec99de043
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index 6f83b0c5a..86f8d3231 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit 6f83b0c5a4b91e45ace33fffeb8ca36ff3291276
+Subproject commit 86f8d32314a322712afd0b23c6f33cda7d9ac726
diff --git a/project/jni/application/sdl-config b/project/jni/application/sdl-config
index 8aceb646f..2f5847e24 100755
--- a/project/jni/application/sdl-config
+++ b/project/jni/application/sdl-config
@@ -4,7 +4,7 @@ LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 prefix=$LOCAL_PATH/../sdl-1.2
-exec_prefix=$LOCAL_PATH/../../obj/local/armeabi
+#exec_prefix=$LOCAL_PATH/../../obj/local/armeabi # Breaks armeabi-v7a build
 exec_prefix_set=no
 
 #usage="\
@@ -50,11 +50,11 @@ while test $# -gt 0; do
       echo -I${prefix}/include -D_GNU_SOURCE=1 -D_REENTRANT
       ;;
     --libs)
-      echo -L${exec_prefix} -lsdl-1.2
+      echo -lsdl-1.2 #-L${exec_prefix} 
       ;;
     --static-libs)
 #    --libs|--static-libs)
-      echo -L${exec_prefix} -lsdl-1.2
+      echo -lsdl-1.2 #-L${exec_prefix} 
       ;;
     *)
       echo "${usage}" 1>&2