diff --git a/.gitmodules b/.gitmodules
index f53e0e10c..f73ee8b46 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "project/jni/application/frogatto"]
 	path = project/jni/application/frogatto
 	url = https://github.com/frogatto/frogatto.git
+[submodule "project/jni/application/ufoai/ufoai"]
+	path = project/jni/application/ufoai/ufoai
+	url = git://ufoai.git.sourceforge.net/gitroot/ufoai/ufoai
diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index 3954189fe..c818d0eb9 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -18,27 +18,27 @@ NDK_VERSION := r5c
 endif
 
 ifneq ($(findstring r4-crystax,$(NDK_VERSION)),)
-$(info Building with CrystaX r4 toolchain - internal STLPort disabled)
+#$(info Building with CrystaX r4 toolchain - internal STLPort disabled)
 CRYSTAX_TOOLCHAIN := 1
 endif
 ifneq ($(findstring r7,$(NDK_VERSION))$(findstring r8,$(NDK_VERSION))$(findstring r9,$(NDK_VERSION)),)
-$(info Building with NDK r7 or newer)
+#$(info Building with NDK r7 or newer)
 NDK_R7_TOOLCHAIN := 1
 endif
 ifneq ($(findstring r6b,$(NDK_VERSION))$(findstring r6-crystax,$(NDK_VERSION))$(NDK_R7_TOOLCHAIN),)
-$(info Building with NDK r6b)
+#$(info Building with NDK r6b)
 NDK_R6_TOOLCHAIN := 1
 endif
 ifneq ($(findstring r5c,$(NDK_VERSION))$(findstring r5-crystax,$(NDK_VERSION))$(NDK_R6_TOOLCHAIN),)
-$(info Building with NDK r5c or newer - internal STLPort disabled)
+#$(info Building with NDK r5c or newer - internal STLPort disabled)
 NDK_R5_TOOLCHAIN := 1
 endif
 ifneq ($(findstring r7-crystax,$(NDK_VERSION)),)
-$(info Building with CrystaX r7 or newer toolchain)
+#$(info Building with CrystaX r7 or newer toolchain)
 CRYSTAX_R7_TOOLCHAIN := 1
 endif
 ifneq ($(findstring r5-crystax,$(NDK_VERSION))$(findstring r6-crystax,$(NDK_VERSION))$(CRYSTAX_R7_TOOLCHAIN),)
-$(info Building with CrystaX r5 or newer toolchain - wchar support enabled)
+#$(info Building with CrystaX r5 or newer toolchain - wchar support enabled)
 CRYSTAX_R5_TOOLCHAIN := 1
 endif
 
diff --git a/project/jni/application/src b/project/jni/application/src
index 92362c4db..104f796a6 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-ufoai
\ No newline at end of file
+ballfield
\ No newline at end of file
diff --git a/project/jni/application/ufoai/ufoai b/project/jni/application/ufoai/ufoai
new file mode 160000
index 000000000..0c9903959
--- /dev/null
+++ b/project/jni/application/ufoai/ufoai
@@ -0,0 +1 @@
+Subproject commit 0c9903959967dac4ce235f117f13ce812bfe4eb0
diff --git a/project/jni/application/vcmi/Android.mk b/project/jni/application/vcmi/Android.mk
index 798463df1..7b290acca 100644
--- a/project/jni/application/vcmi/Android.mk
+++ b/project/jni/application/vcmi/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE := vcmi
 
 # VCMI compilation process is atrocious
 $(shell touch $(LOCAL_PATH)/libvcmi.so)
-$(warning Please ignore the error about libvcmi.so, just recompile)
+#$(warning Please ignore the error about libvcmi.so, just recompile)
 
 ifneq ($(NDK_R5_TOOLCHAIN),)
 LOCAL_SRC_FILES := libvcmi.so