diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh
index 50f1565c7..c5f7cb9b4 100755
--- a/ChangeAppSettings.sh
+++ b/ChangeAppSettings.sh
@@ -63,11 +63,11 @@ if [ -z "$AppDataDownloadUrl" -o -z "$AUTO" ]; then
 echo
 echo "Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL|...'"
 echo "You may specify additional paths to additional downloads delimited by newlines (empty line to finish)"
-echo "If you'll start Description with '!' symbol it will be enabled by default,\nother downloads should be selected by user from config menu"
+echo "If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from config menu"
 echo "If the URL in in the form ':dir/file.dat:http://URL/' it will be downloaded as-is to the application dir and not unzipped"
 echo "If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir -"
 echo "these files are put inside .apk package by build system"
-echo "Also beware of 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS"
+echo "Also please avoid 'https://' URLs, many Android devices do not have trust certificates and will fail to connect to SF.net over HTTPS"
 echo "`echo $AppDataDownloadUrl | tr '^' '\\n'`"
 echo
 AppDataDownloadUrl1=""
diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 9791558e6..4d833bf2a 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -14,6 +14,11 @@ APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(patsubst $(LOCAL_PATH)/%, %, $(APPLICAT
 APP_SUBDIRS := $(APPLICATION_SUBDIRS_BUILD_NONRECURSIVE) $(APPLICATION_SUBDIRS_BUILD_RECURSIVE)
 endif
 
+LOCAL_SRC_FILES := $(filter %.c %.cpp, $(APP_SUBDIRS))
+APP_SUBDIRS := $(filter-out %.c %.cpp, $(APP_SUBDIRS))
+LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
+LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
+
 LOCAL_CFLAGS :=
 LOCAL_C_INCLUDES :=
 
@@ -32,9 +37,6 @@ LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)
 #Change C++ file extension as appropriate
 LOCAL_CPP_EXTENSION := .cpp
 
-LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.cpp))))
-LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
-
 ifneq ($(APPLICATION_CUSTOM_BUILD_SCRIPT),)
 LOCAL_SRC_FILES := dummy.c
 endif
diff --git a/project/jni/application/src b/project/jni/application/src
index 59d41f41e..92362c4db 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-fheroes2
\ No newline at end of file
+ufoai
\ No newline at end of file