diff --git a/project/jni/application/ballfield/AndroidAppSettings.cfg b/project/jni/application/ballfield/AndroidAppSettings.cfg
index 79538e721..b9a1f7f37 100644
--- a/project/jni/application/ballfield/AndroidAppSettings.cfg
+++ b/project/jni/application/ballfield/AndroidAppSettings.cfg
@@ -24,7 +24,7 @@ RedefinedKeysScreenKb="1 2 3 4 5 6 1 2 3 4"
 MultiABI=n
 AppVersionCode=101
 AppVersionName="1.01"
-CompiledLibraries="sdl_mixer sdl_image"
+CompiledLibraries="sdl_mixer sdl_image curl"
 CustomBuildScript=n
 AppCflags='-O2 -finline-functions'
 AppLdflags=''
diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg
index 5613658a5..b47f57dd2 100644
--- a/project/jni/application/fheroes2/AndroidAppSettings.cfg
+++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg
@@ -5,7 +5,7 @@ AppName="Free Heroes 2"
 AppFullName=net.sourceforge.fheroes2
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="Game data|data5.zip^Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^Russian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-ru.cfg/download^Czech translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-cs.cfg/download^Spanish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-es.cfg/download^French translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-fr.cfg/download^Hungarian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-hu.cfg/download^Polish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pl.cfg/download^Portugese translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pt.cfg/download^Swedish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-sv.cfg/download"
+AppDataDownloadUrl="Game data|data6.zip^Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^Russian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-ru.cfg/download^Czech translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-cs.cfg/download^Spanish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-es.cfg/download^French translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-fr.cfg/download^Hungarian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-hu.cfg/download^Polish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pl.cfg/download^Portugese translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pt.cfg/download^Swedish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-sv.cfg/download"
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 NeedDepthBuffer=n
@@ -22,13 +22,13 @@ AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L"
 MultiABI=n
-AppVersionCode=216711
-AppVersionName="2167.11"
+AppVersionCode=218811
+AppVersionName="2188.11"
 CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl"
 CustomBuildScript=n
-AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF'
+AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple'
 AppLdflags=''
-AppSubdirsBuild='fheroes2/src/engine/* fheroes2/src/fheroes2/* fheroes2/src/xmlccwrap/* fheroes2-ai'
+AppSubdirsBuild='fheroes2/src/engine/* fheroes2/src/xmlccwrap/* fheroes2/src/fheroes2/ai fheroes2/src/fheroes2/ai/simple fheroes2/src/fheroes2/agg fheroes2/src/fheroes2/algorithm fheroes2/src/fheroes2/army fheroes2/src/fheroes2/battle2 fheroes2/src/fheroes2/castle fheroes2/src/fheroes2/dialog fheroes2/src/fheroes2/editor fheroes2/src/fheroes2/game fheroes2/src/fheroes2/gui fheroes2/src/fheroes2/heroes fheroes2/src/fheroes2/image fheroes2/src/fheroes2/kingdom fheroes2/src/fheroes2/maps fheroes2/src/fheroes2/monster fheroes2/src/fheroes2/network fheroes2/src/fheroes2/objects fheroes2/src/fheroes2/pocketpc fheroes2/src/fheroes2/resource fheroes2/src/fheroes2/spell fheroes2/src/fheroes2/system fheroes2/src/fheroes2/test'
 AppUseCrystaXToolchain=n
 AppCmdline='fheroes2 -d 500'
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/application/fheroes2/AndroidData/data5.zip b/project/jni/application/fheroes2/AndroidData/data5.zip
deleted file mode 100644
index e0ac3b6e1..000000000
Binary files a/project/jni/application/fheroes2/AndroidData/data5.zip and /dev/null differ
diff --git a/project/jni/application/fheroes2/AndroidData/data6.zip b/project/jni/application/fheroes2/AndroidData/data6.zip
new file mode 100644
index 000000000..d8666171a
Binary files /dev/null and b/project/jni/application/fheroes2/AndroidData/data6.zip differ
diff --git a/project/jni/application/fheroes2/fheroes2-ai b/project/jni/application/fheroes2/fheroes2-ai
deleted file mode 120000
index 0444cbda5..000000000
--- a/project/jni/application/fheroes2/fheroes2-ai
+++ /dev/null
@@ -1 +0,0 @@
-/home/pelya/doc/fheroes2-ai
\ No newline at end of file
diff --git a/project/jni/application/fheroes2/readme.txt b/project/jni/application/fheroes2/readme.txt
index 5127b48ed..fb52eb1a8 100644
--- a/project/jni/application/fheroes2/readme.txt
+++ b/project/jni/application/fheroes2/readme.txt
@@ -1,7 +1,4 @@
 Grab Free Heroes 2 sources with SVN from
 https://fheroes2.svn.sourceforge.net/svnroot/fheroes2/trunk/fheroes2
-and put them here, in directory "fheroes2", 
-then add option "-DAI_EMPTY" to the AppCflags in AndroidAppSettings.cfg,
-and compile with build.sh
+and put them here, in directory "fheroes2", and compile with build.sh.
 You will need Android SDK 2.2, NDK r4b, and "ant" tool.
-If you want AI code you should contact author of Free Heroes 2, this code is not open-source.
\ No newline at end of file
diff --git a/project/jni/application/src b/project/jni/application/src
index 104f796a6..92362c4db 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-ballfield
\ No newline at end of file
+ufoai
\ No newline at end of file
diff --git a/project/jni/application/ufoai/AndroidAppSettings.cfg b/project/jni/application/ufoai/AndroidAppSettings.cfg
new file mode 100644
index 000000000..df6381fdb
--- /dev/null
+++ b/project/jni/application/ufoai/AndroidAppSettings.cfg
@@ -0,0 +1,34 @@
+# The application settings for Android libSDL port
+AppSettingVersion=16
+LibSdlVersion=1.2
+AppName="UFO: Alien Invasion"
+AppFullName=net.sourceforge.ufoai
+ScreenOrientation=h
+InhibitSuspend=n
+AppDataDownloadUrl="Game data (1 Gb)|"
+SdlVideoResize=n
+SdlVideoResizeKeepAspect=n
+NeedDepthBuffer=y
+AppUsesMouse=y
+AppNeedsTwoButtonMouse=y
+AppNeedsArrowKeys=y
+AppNeedsTextInput=y
+AppUsesJoystick=n
+AppHandlesJoystickSensitivity=n
+AppUsesMultitouch=n
+NonBlockingSwapBuffers=n
+RedefinedKeys="LCTRL RETURN PAGEUP PAGEDOWN RETURN"
+AppTouchscreenKeyboardKeysAmount=0
+AppTouchscreenKeyboardKeysAmountAutoFire=0
+RedefinedKeysScreenKb="LCTRL RETURN PAGEUP PAGEDOWN RETURN"
+MultiABI=n
+AppVersionCode=24001
+AppVersionName="2.4.0.01"
+CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png jpeg tremor ogg intl lua curl"
+CustomBuildScript=n
+AppCflags='-finline-functions -O2 -std=c99 -Dmain=SDL_main -DCOMPILE_UFO=1 -DHAVE_CONFIG_H=1'
+AppLdflags=''
+AppSubdirsBuild='ufoai/src/client/* ufoai/src/common ufoai/src/game ufoai/src/ports/linux ufoai/src/ports/unix ufoai/src/shared'
+AppUseCrystaXToolchain=n
+AppCmdline=''
+ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/application/ufoai/icon.png b/project/jni/application/ufoai/icon.png
new file mode 120000
index 000000000..9f5def99e
--- /dev/null
+++ b/project/jni/application/ufoai/icon.png
@@ -0,0 +1 @@
+ufoai/src/ports/linux/ufo.png
\ No newline at end of file
diff --git a/project/jni/application/ufoai/ufoai b/project/jni/application/ufoai/ufoai
new file mode 120000
index 000000000..804bef672
--- /dev/null
+++ b/project/jni/application/ufoai/ufoai
@@ -0,0 +1 @@
+../../../../../ufoai/
\ No newline at end of file
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
index e4d414907..d99a058b3 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c
@@ -124,9 +124,6 @@ int SDL_ANDROID_InsideVideoThread()
 }
 
 
-static void SdlGlRenderInit();
-
-
 /* ANDROID driver bootstrap functions */
 
 static int ANDROID_Available(void)