diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index 5d9f76415..2c17e24dd 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -25,5 +25,11 @@ ifneq ($(findstring r5b,$(NDK_VERSION))$(findstring r5-crystax,$(NDK_VERSION)),)
 $(info Building with NDK r5b - internal STLPort disabled)
 NDK_R5_TOOLCHAIN := 1
 endif
+ifneq ($(findstring r5-crystax-1.beta3,$(NDK_VERSION)),)
+$(info Building with CrystaX r5 beta3 toolchain - internal STLPort disabled, wchar support enabled)
+CRYSTAX_R5B3_TOOLCHAIN := 1
+endif
+
+NDK_PATH := $(shell dirname $(shell which ndk-build))
 
 include $(call all-subdir-makefiles)
diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 4d833bf2a..a248a33d6 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -25,6 +25,9 @@ LOCAL_C_INCLUDES :=
 ifeq ($(CRYSTAX_TOOLCHAIN)$(NDK_R5_TOOLCHAIN),)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stlport/stlport
 endif
+ifneq ($(CRYSTAX_R5B3_TOOLCHAIN),)
+LOCAL_C_INCLUDES += $(NDK_PATH)/sources/wchar-support/include
+endif
 
 LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
 					$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include \
diff --git a/project/jni/application/NewRAW b/project/jni/application/NewRAW
index c26a6b7d4..cee051414 160000
--- a/project/jni/application/NewRAW
+++ b/project/jni/application/NewRAW
@@ -1 +1 @@
-Subproject commit c26a6b7d49b2e36fb000212f4723f4bf89c9148b
+Subproject commit cee051414998b8a1fd0ec35bbade365c3bf082f1
diff --git a/project/jni/application/commandergenius b/project/jni/application/commandergenius
index 448aa2a71..72d8bf896 160000
--- a/project/jni/application/commandergenius
+++ b/project/jni/application/commandergenius
@@ -1 +1 @@
-Subproject commit 448aa2a71d6416c186baca063d34b1203943ec3c
+Subproject commit 72d8bf89698fe03583ef07c0dc0c854368d3a9d3
diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg
index e2a08a398..af558f51a 100644
--- a/project/jni/application/fheroes2/AndroidAppSettings.cfg
+++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg
@@ -23,11 +23,11 @@ AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L"
 MultiABI=n
-AppVersionCode=231412
-AppVersionName="2314.12"
+AppVersionCode=234913
+AppVersionName="2349.13"
 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 -DWITH_AI=simple'
+AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple -DWITH_NET'
 AppLdflags=''
 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'
 AppCmdline='fheroes2 -d 500'
diff --git a/project/jni/sdl_fake_stdout/Android.mk b/project/jni/sdl_fake_stdout/Android.mk
index e8116a561..9a46a8109 100644
--- a/project/jni/sdl_fake_stdout/Android.mk
+++ b/project/jni/sdl_fake_stdout/Android.mk
@@ -18,4 +18,9 @@ LOCAL_SRC_FILES := SDL_fake_stdout.cpp
 LOCAL_SHARED_LIBRARIES := 
 LOCAL_LDLIBS := -llog
 
+ifneq ($(CRYSTAX_R5B3_TOOLCHAIN),)
+LOCAL_C_INCLUDES += $(NDK_PATH)/sources/wchar-support/include
+LOCAL_LDFLAGS += sources/wchar-support/libs/armeabi/libwchar_static.a
+endif
+
 include $(BUILD_STATIC_LIBRARY)