diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 80556f835..283d1b567 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -50,10 +50,14 @@ 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_R5B3_TOOLCHAIN),)
+LOCAL_LDLIBS += -L$(NDK_PATH)/sources/wchar-support/libs/armeabi -lwchar_static
+endif
+
 LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \
 	for f in $(LOCAL_PATH)/../../obj/local/armeabi/*.so ; do \
 		if echo $$f | grep "libapplication[.]so" > /dev/null ; then \
diff --git a/project/jni/application/setEnvironment-r5b.sh b/project/jni/application/setEnvironment-r5b.sh
index a31d71caa..b98497863 100755
--- a/project/jni/application/setEnvironment-r5b.sh
+++ b/project/jni/application/setEnvironment-r5b.sh
@@ -47,7 +47,7 @@ done
 
 if [ -n "$CRYSTAX_WCHAR" ]; then
 	CRYSTAX_WCHAR_INCLUDE=-I$NDK/sources/wchar-support/include
-	CRYSTAX_WCHAR_LIB="-L$NDK/sources/wchar-support/libs/armeabi -lwchar_static"
+	CRYSTAX_WCHAR_LIB="$NDK/sources/wchar-support/libs/armeabi/libwchar_static.a"
 fi
 
 CFLAGS="\
@@ -63,9 +63,10 @@ CFLAGS="\
 `echo $APP_MODULES | sed \"s@\([-a-zA-Z0-9_.]\+\)@-I$LOCAL_PATH/../\1/include@g\"` \
 $CRYSTAX_WCHAR_INCLUDE"
 
+#-shared flag creates problems with damn libtool, so we're using -Wl,-shared instead
 LDFLAGS="\
--fexceptions -frtti \
--Wl,-soname,libapplication.so -shared --sysroot=$NDK/platforms/$PLATFORMVER/arch-arm \
+-fexceptions -frtti -shared \
+-Wl,-soname,libapplication.so --sysroot=$NDK/platforms/$PLATFORMVER/arch-arm \
 `echo $APP_SHARED_LIBS | sed \"s@\([-a-zA-Z0-9_.]\+\)@$LOCAL_PATH/../../obj/local/armeabi/lib\1.so@g\"` \
 $NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libc.so \
 $NDK/platforms/$PLATFORMVER/arch-arm/usr/lib/libm.so \
diff --git a/project/jni/application/vcmi/AndroidAppSettings.cfg b/project/jni/application/vcmi/AndroidAppSettings.cfg
index 06474aa5e..fc7d2960d 100644
--- a/project/jni/application/vcmi/AndroidAppSettings.cfg
+++ b/project/jni/application/vcmi/AndroidAppSettings.cfg
@@ -28,9 +28,9 @@ MultiABI=n
 AppVersionCode=08501
 AppVersionName="0.85.01"
 CompiledLibraries="sdl_mixer sdl_image sdl_ttf avutil avcore avcodec avformat swscale boost_program_options boost_filesystem boost_iostreams boost_system boost_thread"
-CustomBuildScript=y
-AppCflags=''
+CustomBuildScript=n
+AppCflags='-DDATA_DIR=\".\" -DBIN_DIR=\"/data/data/eu.vcmi/lib\" -DLIB_DIR=\"/data/data/eu.vcmi/lib\" -DWITH_AVCODEC_DECODE_VIDEO2=1'
 AppLdflags='-lz'
-AppSubdirsBuild=''
+AppSubdirsBuild='vcmi vcmi/lib vcmi/client'
 AppCmdline=''
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/boost/Android.mk b/project/jni/boost/Android.mk
index 7a8ea47b8..0cb944d6e 100644
--- a/project/jni/boost/Android.mk
+++ b/project/jni/boost/Android.mk
@@ -8,14 +8,14 @@ ifneq ($(LOCAL_MODULE),boost)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 
 ifneq ($(NDK_R5_TOOLCHAIN),)
-LOCAL_SRC_FILES := lib/lib$(LOCAL_MODULE).a
+LOCAL_SRC_FILES := lib/arm-linux-androideabi-4.4.3/lib$(LOCAL_MODULE).a
 include $(PREBUILT_STATIC_LIBRARY)
 else
 LOCAL_SRC_FILES := dummy.c
 include $(BUILD_STATIC_LIBRARY)
-$(abspath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LOCAL_MODULE).a): $(LOCAL_PATH)/lib/lib$(LOCAL_MODULE).a OVERRIDE_CUSTOM_LIB
+$(abspath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LOCAL_MODULE).a): $(LOCAL_PATH)/lib/arm-eabi-4.4.0/lib$(LOCAL_MODULE).a OVERRIDE_CUSTOM_LIB
 	cp -f $< $@
-$(abspath $(LOCAL_PATH)/../../obj/local/armeabi-v7a/lib$(LOCAL_MODULE).a): $(LOCAL_PATH)/lib/lib$(LOCAL_MODULE).a OVERRIDE_CUSTOM_LIB
+$(abspath $(LOCAL_PATH)/../../obj/local/armeabi-v7a/lib$(LOCAL_MODULE).a): $(LOCAL_PATH)/lib/arm-eabi-4.4.0/lib$(LOCAL_MODULE).a OVERRIDE_CUSTOM_LIB
 	cp -f $< $@
 .PHONY: OVERRIDE_CUSTOM_LIB
 OVERRIDE_CUSTOM_LIB:
diff --git a/project/jni/boost/lib/libboost_date_time.a b/project/jni/boost/lib/arm-eabi-4.4.0/libboost_date_time.a
similarity index 100%
rename from project/jni/boost/lib/libboost_date_time.a
rename to project/jni/boost/lib/arm-eabi-4.4.0/libboost_date_time.a
diff --git a/project/jni/boost/lib/libboost_filesystem.a b/project/jni/boost/lib/arm-eabi-4.4.0/libboost_filesystem.a
similarity index 100%
rename from project/jni/boost/lib/libboost_filesystem.a
rename to project/jni/boost/lib/arm-eabi-4.4.0/libboost_filesystem.a
diff --git a/project/jni/boost/lib/libboost_iostreams.a b/project/jni/boost/lib/arm-eabi-4.4.0/libboost_iostreams.a
similarity index 100%
rename from project/jni/boost/lib/libboost_iostreams.a
rename to project/jni/boost/lib/arm-eabi-4.4.0/libboost_iostreams.a
diff --git a/project/jni/boost/lib/libboost_program_options.a b/project/jni/boost/lib/arm-eabi-4.4.0/libboost_program_options.a
similarity index 100%
rename from project/jni/boost/lib/libboost_program_options.a
rename to project/jni/boost/lib/arm-eabi-4.4.0/libboost_program_options.a
diff --git a/project/jni/boost/lib/libboost_regex.a b/project/jni/boost/lib/arm-eabi-4.4.0/libboost_regex.a
similarity index 100%
rename from project/jni/boost/lib/libboost_regex.a
rename to project/jni/boost/lib/arm-eabi-4.4.0/libboost_regex.a
diff --git a/project/jni/boost/lib/libboost_signals.a b/project/jni/boost/lib/arm-eabi-4.4.0/libboost_signals.a
similarity index 100%
rename from project/jni/boost/lib/libboost_signals.a
rename to project/jni/boost/lib/arm-eabi-4.4.0/libboost_signals.a
diff --git a/project/jni/boost/lib/libboost_system.a b/project/jni/boost/lib/arm-eabi-4.4.0/libboost_system.a
similarity index 100%
rename from project/jni/boost/lib/libboost_system.a
rename to project/jni/boost/lib/arm-eabi-4.4.0/libboost_system.a
diff --git a/project/jni/boost/lib/libboost_thread.a b/project/jni/boost/lib/arm-eabi-4.4.0/libboost_thread.a
similarity index 100%
rename from project/jni/boost/lib/libboost_thread.a
rename to project/jni/boost/lib/arm-eabi-4.4.0/libboost_thread.a
diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_date_time.a b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_date_time.a
new file mode 100644
index 000000000..079aff346
Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_date_time.a differ
diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_filesystem.a b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_filesystem.a
new file mode 100644
index 000000000..50bf09597
Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_filesystem.a differ
diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_iostreams.a b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_iostreams.a
new file mode 100644
index 000000000..17bda21aa
Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_iostreams.a differ
diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_program_options.a b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_program_options.a
new file mode 100644
index 000000000..d30e71623
Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_program_options.a differ
diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_regex.a b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_regex.a
new file mode 100644
index 000000000..31cf2fecf
Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_regex.a differ
diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_signals.a b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_signals.a
new file mode 100644
index 000000000..b73320702
Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_signals.a differ
diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_system.a b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_system.a
new file mode 100644
index 000000000..a87993cfd
Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_system.a differ
diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_thread.a b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_thread.a
new file mode 100644
index 000000000..27cfaed17
Binary files /dev/null and b/project/jni/boost/lib/arm-linux-androideabi-4.4.3/libboost_thread.a differ
diff --git a/project/jni/boost/src b/project/jni/boost/src
index 447333981..adf4e297b 160000
--- a/project/jni/boost/src
+++ b/project/jni/boost/src
@@ -1 +1 @@
-Subproject commit 447333981a73ac494adf01638b40a360d2618348
+Subproject commit adf4e297b7aa7054adb9455b67240d501cc81bee