diff --git a/.gitmodules b/.gitmodules
index 7c38d2afe..dd1673082 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -59,3 +59,6 @@
 [submodule "project/jni/application/xserver-debian/xserver"]
 	path = project/jni/application/xserver-debian/xserver
 	url = git@github.com:pelya/xserver.git
+[submodule "project/jni/application/uae4all2"]
+	path = project/jni/application/uae4all2
+	url = git@github.com:lubomyr/uae4all2.git
diff --git a/project/jni/application/setEnvironment-armeabi-v7a-hard.sh b/project/jni/application/setEnvironment-armeabi-v7a-hard.sh
index 0f7a77dcf..5c9bc359e 100755
--- a/project/jni/application/setEnvironment-armeabi-v7a-hard.sh
+++ b/project/jni/application/setEnvironment-armeabi-v7a-hard.sh
@@ -22,7 +22,7 @@ grep "64.bit" "$NDK/RELEASE.TXT" >/dev/null 2>&1 && MYARCH="${MYARCH}_64"
 
 #echo NDK $NDK
 GCCPREFIX=arm-linux-androideabi
-[ -z "$GCCVER" ] && GCCVER=4.8
+[ -z "$GCCVER" ] && GCCVER=4.6
 [ -z "$PLATFORMVER" ] && PLATFORMVER=android-14
 LOCAL_PATH=`dirname $0`
 if which realpath > /dev/null ; then
@@ -50,7 +50,7 @@ MISSING_LIB=
 
 CFLAGS="\
 -fpic -ffunction-sections -funwind-tables -fstack-protector \
--no-canonical-prefixes -march=armv7-a -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -flto \
+-no-canonical-prefixes -march=armv7-a -mhard-float -D_NDK_MATH_NO_SOFTFP=1 \
 -mfpu=vfpv3-d16 -mthumb -O2 -g -DNDEBUG \
 -fomit-frame-pointer -fno-strict-aliasing -finline-limit=300 \
 -DANDROID -Wall -Wno-unused -Wa,--noexecstack -Wformat -Werror=format-security \
@@ -84,7 +84,7 @@ $SHARED \
 `echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/$ARCH/lib\1.so@g\"` \
 -L$NDK/platforms/$PLATFORMVER/arch-arm/usr/lib \
 -lc -lGLESv1_CM -ldl -llog -lz \
--Wl,--no-warn-mismatch -lm_hard -flto \
+-Wl,--no-warn-mismatch -lm_hard \
 -L$NDK/sources/cxx-stl/gnu-libstdc++/$GCCVER/libs/$ARCH \
 -lgnustl_static \
 -no-canonical-prefixes -march=armv7-a -Wl,--fix-cortex-a8 $UNRESOLVED -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now \
diff --git a/project/jni/application/uae4all2 b/project/jni/application/uae4all2
new file mode 160000
index 000000000..e4e0ab16a
--- /dev/null
+++ b/project/jni/application/uae4all2
@@ -0,0 +1 @@
+Subproject commit e4e0ab16a83e949f549c1d0b088a87b51e9862f2