diff --git a/project/jni/application/ballfield/ballfield.cpp b/project/jni/application/ballfield/ballfield.cpp
index 4583998dd..52b0e41df 100644
--- a/project/jni/application/ballfield/ballfield.cpp
+++ b/project/jni/application/ballfield/ballfield.cpp
@@ -657,7 +657,6 @@ int main(int argc, char* argv[])
 		SDL_FillRect(screen, &r, color);
 
 		SDL_Flip(SDL_GetVideoSurface());
-		__android_log_print(ANDROID_LOG_INFO, "Ballfield", "SDL_Flip");
 		SDL_Event evt;
 		while( SDL_PollEvent(&evt) )
 		{
diff --git a/project/jni/application/hheretic/AndroidAppSettings.cfg b/project/jni/application/hheretic/AndroidAppSettings.cfg
index 3872d2480..5d58fd224 100644
--- a/project/jni/application/hheretic/AndroidAppSettings.cfg
+++ b/project/jni/application/hheretic/AndroidAppSettings.cfg
@@ -1,33 +1,46 @@
 # The application settings for Android libSDL port
-AppSettingVersion=15
+AppSettingVersion=17
 LibSdlVersion=1.2
 AppName="hHeretic"
 AppFullName=net.hheretic.sdl
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="Data files size is 19 Mb|https://sites.google.com/site/andgamdev/heretic-data.zip?attredirects=0&d=1"
+AppDataDownloadUrl="Data files|heretic-shareware.zip"
+VideoDepthBpp=16
+NeedDepthBuffer=n
+NeedStencilBuffer=n
+NeedGles2=n
+SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
-NeedDepthBuffer=n
+CompatibilityHacks=n
+CompatibilityHacksStaticInit=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=n
+ShowMouseCursor=n
+ForceRelativeMouseMode=n
 AppNeedsArrowKeys=y
 AppNeedsTextInput=y
 AppUsesJoystick=n
 AppHandlesJoystickSensitivity=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
-RedefinedKeys="SPACE RETURN TAB LCTRL SPACE"
-AppTouchscreenKeyboardKeysAmount=3
-AppTouchscreenKeyboardKeysAmountAutoFire=0
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP SPACE"
+AppTouchscreenKeyboardKeysAmount=6
+AppTouchscreenKeyboardKeysAmountAutoFire=2
+RedefinedKeysScreenKb="LCTRL LALT SPACE TAB RIGHTBRACKET RETURN"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
+FirstStartMenuOptions=''
 MultiABI=n
 AppVersionCode=02201
 AppVersionName="0.2.2.01"
+ResetSdlConfigForThisVersion=y
+DeleteFilesOnUpgrade="%"
 CompiledLibraries="jpeg png sdl_mixer"
 CustomBuildScript=y
 AppCflags=''
 AppLdflags=''
 AppSubdirsBuild=''
-AppUseCrystaXToolchain=n
-AppCmdline=' -waddir .'
+AppCmdline='heretic -waddir .'
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/application/hheretic/AndroidBuild.sh b/project/jni/application/hheretic/AndroidBuild.sh
index d353e8e3a..4fa8f9a3d 100755
--- a/project/jni/application/hheretic/AndroidBuild.sh
+++ b/project/jni/application/hheretic/AndroidBuild.sh
@@ -5,10 +5,11 @@ LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 ln -sf libsdl_mixer.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_mixer.so
 
+[ -e hheretic-0.2.2-src ] || curl --location "http://sourceforge.net/project/downloading.php?group_id=4501&filename=hheretic-0.2.2-src.tgz" | gunzip | tar xv
 cd hheretic-0.2.2-src
 if [ \! -f Makefile ] ; then
-	../../launchConfigure.sh --disable-gl
+	../../setEnvironment.sh ./configure --host=arm-linux-androideabi --disable-gl --without-x
 fi
 rm -f ../libapplication.so
-make
+make -j4 CPPFLAGS="-include SDL_main.h -Iinclude -I."
 mv -f hheretic-sdl ../libapplication.so
diff --git a/project/jni/application/hheretic/AndroidData/heretic-shareware.zip00 b/project/jni/application/hheretic/AndroidData/heretic-shareware.zip00
new file mode 100644
index 000000000..de1832868
Binary files /dev/null and b/project/jni/application/hheretic/AndroidData/heretic-shareware.zip00 differ
diff --git a/project/jni/application/hheretic/AndroidData/heretic-shareware.zip01 b/project/jni/application/hheretic/AndroidData/heretic-shareware.zip01
new file mode 100644
index 000000000..77aa82d21
Binary files /dev/null and b/project/jni/application/hheretic/AndroidData/heretic-shareware.zip01 differ
diff --git a/project/jni/application/hheretic/AndroidData/heretic-shareware.zip02 b/project/jni/application/hheretic/AndroidData/heretic-shareware.zip02
new file mode 100644
index 000000000..d87feac55
Binary files /dev/null and b/project/jni/application/hheretic/AndroidData/heretic-shareware.zip02 differ
diff --git a/project/jni/application/src b/project/jni/application/src
deleted file mode 120000
index 7fa7b8f4e..000000000
--- a/project/jni/application/src
+++ /dev/null
@@ -1 +0,0 @@
-opentyrian
\ No newline at end of file