diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java
index 65a249eac..a21e5b059 100644
--- a/project/java/MainActivity.java
+++ b/project/java/MainActivity.java
@@ -1,4 +1,4 @@
-/*                                            OF
+/*
 Simple DirectMedia Layer
 Java source code (C) 2009-2011 Sergii Pylypenko
   
diff --git a/project/java/Video.java b/project/java/Video.java
index 3217e52ac..2f6d27b7c 100644
--- a/project/java/Video.java
+++ b/project/java/Video.java
@@ -1,4 +1,4 @@
-/*ACTION_HOVER_MOVE
+/*
 Simple DirectMedia Layer
 Java source code (C) 2009-2011 Sergii Pylypenko
   
diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 61a63ee0f..38291f8f4 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -22,13 +22,6 @@ LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wil
 LOCAL_CFLAGS :=
 LOCAL_C_INCLUDES :=
 
-#ifeq ($(CRYSTAX_TOOLCHAIN)$(NDK_R5_TOOLCHAIN),)
-#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stlport/stlport
-#endif
-ifneq ($(CRYSTAX_R5_TOOLCHAIN),)
-LOCAL_C_INCLUDES += $(NDK_PATH)/sources/crystax/include
-endif
-
 LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
 					$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
 					$(foreach L, $(COMPILED_LIBRARIES), $(LOCAL_PATH)/../$(L)/include) \
@@ -50,12 +43,17 @@ LOCAL_STATIC_LIBRARIES += stlport
 
 LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
 
-LOCAL_LDFLAGS := -Lobj/local/armeabi 
+LOCAL_LDFLAGS := -Lobj/local/armeabi
 
 LOCAL_LDFLAGS += $(APPLICATION_ADDITIONAL_LDFLAGS)
 
 ifneq ($(CRYSTAX_R5_TOOLCHAIN),)
-LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static
+LOCAL_C_INCLUDES += $(NDK_PATH)/sources/crystax/include
+LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/$(TARGET_ARCH_ABI) -lcrystax_static
+endif
+ifneq ($(NDK_R6_TOOLCHAIN),) # NDK r6 broke it
+LOCAL_C_INCLUDES += $(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/include
+LOCAL_LDLIBS += -L$(NDK_PATH)/sources/cxx-stl/gnu-libstdc++/libs/$(TARGET_ARCH_ABI) -lstdc++
 endif
 
 LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \
diff --git a/project/jni/application/gemrb/AndroidAppSettings.cfg b/project/jni/application/gemrb/AndroidAppSettings.cfg
index 8d40b05fc..92b4f2ef8 100644
--- a/project/jni/application/gemrb/AndroidAppSettings.cfg
+++ b/project/jni/application/gemrb/AndroidAppSettings.cfg
@@ -6,12 +6,17 @@ AppFullName=net.sourceforge.gemrb
 ScreenOrientation=h
 InhibitSuspend=n
 AppDataDownloadUrl="Baldur's gate 2 demo|http://sourceforge.net/projects/libsdl-android/files/gemrb/bg2demo.zip/download^!GemRB data(override)|override4.zip^!GemRB data(scripts)|scripts4.zip"
+VideoDepthBpp=16
+NeedDepthBuffer=n
+NeedStencilBuffer=n
+NeedGles2=n
+SwVideoMode=n
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=y
-NeedDepthBuffer=n
-SwVideoMode=n
+CompatibilityHacks=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
+ForceRelativeMouseMode=n
 AppNeedsArrowKeys=n
 AppNeedsTextInput=y
 AppUsesJoystick=n
@@ -24,6 +29,7 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="LCTRL c NO_REMAP NO_REMAP e"
 StartupMenuButtonTimeout=2000
 HiddenMenuOptions=''
+FirstStartMenuOptions=''
 MultiABI=y
 AppVersionCode=0643
 AppVersionName="0.6.4.3"
diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg
index 53268dc2b..e6e8548df 100644
--- a/project/jni/application/openttd/AndroidAppSettings.cfg
+++ b/project/jni/application/openttd/AndroidAppSettings.cfg
@@ -5,13 +5,18 @@ AppName="OpenTTD"
 AppFullName=org.openttd.sdl
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-6.zip/download^!MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^!Big GUI add-on - enable it in NewGRF Settings|:data/opengfx+biggui.grf:http://www.tt-forums.net/download/file.php?id=135095"
+AppDataDownloadUrl="!Data files - 20 Mb|http://sourceforge.net/projects/libsdl-android/files/OpenTTD/openttd-data-7.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download"
+VideoDepthBpp=16
+NeedDepthBuffer=n
+NeedStencilBuffer=n
+NeedGles2=n
+SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
-NeedDepthBuffer=n
-SwVideoMode=y
+CompatibilityHacks=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
+ForceRelativeMouseMode=n
 AppNeedsArrowKeys=n
 AppNeedsTextInput=y
 AppUsesJoystick=n
@@ -24,9 +29,10 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="LALT RETURN KP_PLUS KP_MINUS SPACE DELETE KP_PLUS KP_MINUS 1 2"
 StartupMenuButtonTimeout=3000
 HiddenMenuOptions='KeyboardConfigMainMenu AudioConfig'
+FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=11113
-AppVersionName="1.1.1.13"
+AppVersionCode=11314
+AppVersionName="1.1.3.14"
 CompiledLibraries="jpeg png freetype timidity lzma lzo2"
 CustomBuildScript=y
 AppCflags=''
diff --git a/project/jni/application/openttd/AndroidBuild.sh b/project/jni/application/openttd/AndroidBuild.sh
index f1c3f5294..a6d97f702 100755
--- a/project/jni/application/openttd/AndroidBuild.sh
+++ b/project/jni/application/openttd/AndroidBuild.sh
@@ -16,6 +16,6 @@ if [ \! -f openttd/objs/lang/english.lng ] ; then
 fi
 
 if [ \! -f openttd/Makefile ] ; then
-	../setEnvironment.sh sh -c "cd openttd && ./configure --host=arm-eabi --with-sdl --with-freetype=sdl-config --with-png --with-zlib --without-icu --with-libtimidity=$LOCAL_PATH/../../../obj/local/armeabi/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/armeabi/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --without-fontconfig --endian=LE"
+	../setEnvironment.sh sh -c "cd openttd && ./configure --host=arm-linux-androideabi --with-sdl --with-freetype=sdl-config --with-png --with-zlib --without-icu --with-libtimidity=$LOCAL_PATH/../../../obj/local/armeabi/libtimidity.so --with-lzo2=$LOCAL_PATH/../../../obj/local/armeabi/liblzo2.so --prefix-dir='.' --data-dir='' --without-allegro --without-fontconfig --endian=LE"
 fi
 ../setEnvironment.sh sh -c "cd openttd && make -j1 VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -llzo2 -lpng -ltimidity -lfreetype -lgcc -lz -lc -lstdc++'" && cp -f openttd/objs/release/openttd libapplication.so
diff --git a/project/jni/application/openttd/openttd b/project/jni/application/openttd/openttd
index b376b83e9..923b70a7c 120000
--- a/project/jni/application/openttd/openttd
+++ b/project/jni/application/openttd/openttd
@@ -1 +1 @@
-../../../../../openttd-1.1.1
\ No newline at end of file
+../../../../../openttd-1.1.3
\ No newline at end of file
diff --git a/project/jni/application/src b/project/jni/application/src
index 8193e5e18..550b7b622 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-vcmi
\ No newline at end of file
+openttd
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index cc07b03e1..481e6026d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -14,10 +14,10 @@ Also it's compatible with NDK r4b and all versions of CrystaX NDK starting from
 CrystaX NDK adds support for wide chars, and required if you want to use Boost libraries.
 http://www.crystax.net/android/ndk.php
 The most supported environment for this port is Linux, MacOs should be okay too.
-If you're developing under Windows you'd better install andLinux or Ubuntu+Wubi, to get proper Linux environment
-running inside Windows, then install Linux toolchain on it. I was told andLinux compiles faster than Cygwin.
-Also you'll need full set of Linux utils and symlinks support to launch ChangeAppSettings.sh (sh, grep, sed, tr).
-http://www.pocketmagic.net/?p=1332 - guide how to set up environment in Cygwin.
+If you're developing under Windows you'd better install Portable Ubuntu, to get proper Linux environment
+running inside Windows, then install Linux toolchain on it.
+https://sourceforge.net/projects/portableubuntu/
+Cygwin is not supported by the NDK, starting from the NDK r6.
 
 How to compile demo application
 ===============================