diff --git a/project/jni/application/milkytracker/AndroidAppSettings.cfg b/project/jni/application/milkytracker/AndroidAppSettings.cfg
index 8beebe34d..ce1955ac8 100644
--- a/project/jni/application/milkytracker/AndroidAppSettings.cfg
+++ b/project/jni/application/milkytracker/AndroidAppSettings.cfg
@@ -1,14 +1,15 @@
 # The application settings for Android libSDL port
-AppSettingVersion=15
+AppSettingVersion=17
 LibSdlVersion=1.2
 AppName="Milkytracker"
 AppFullName=org.milkytracker.sdl
 ScreenOrientation=h
 InhibitSuspend=y
-AppDataDownloadUrl="Data size is 1 Mb|milkytracker-data.zip"
+AppDataDownloadUrl="!Example songs|MilkyTracker-ExampleSongs.zip"
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 NeedDepthBuffer=n
+SwVideoMode=y
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
 AppNeedsArrowKeys=n
@@ -17,17 +18,19 @@ AppUsesJoystick=n
 AppHandlesJoystickSensitivity=y
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
-RedefinedKeys="SPACE RETURN PLUS MINUS TAB ESCAPE DELETE"
+RedefinedKeys="SPACE TAB NO_REMAP NO_REMAP RETURN ESCAPE DELETE"
 AppTouchscreenKeyboardKeysAmount=0
 AppTouchscreenKeyboardKeysAmountAutoFire=0
+RedefinedKeysScreenKb="SPACE TAB PLUS MINUS RETURN ESCAPE DELETE"
+StartupMenuButtonTimeout=3000
+HiddenMenuOptions='OptionalDownloadConfig'
 MultiABI=n
 AppVersionCode=0908501
 AppVersionName="0.90.85.01"
-CompiledLibraries="jpeg png zzip"
+CompiledLibraries="jpeg png"
 CustomBuildScript=y
 AppCflags=''
 AppLdflags=''
 AppSubdirsBuild=''
-AppUseCrystaXToolchain=n
-AppCmdline=''
+AppCmdline='milkytracker -fullscreen'
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/application/milkytracker/AndroidBuild.sh b/project/jni/application/milkytracker/AndroidBuild.sh
index fdecf2ed3..7388f51ab 100755
--- a/project/jni/application/milkytracker/AndroidBuild.sh
+++ b/project/jni/application/milkytracker/AndroidBuild.sh
@@ -11,7 +11,7 @@ if [ \! -f milkytracker-0.90.85/configure ] ; then
 fi
 
 if [ \! -f milkytracker-0.90.85/Makefile ] ; then
-	../setEnvironment.sh sh -c "cd milkytracker-0.90.85 && ZZIP_CFLAGS='-I$LOCAL_PATH/../../zzip/include' ZZIP_LIBS='-L$LOCAL_PATH/../../../obj/local/armeabi -lzzip' ./configure --host=arm-eabi "
+	../setEnvironment.sh sh -c "cd milkytracker-0.90.85 && ZZIP_CFLAGS='-I$LOCAL_PATH/../../zzip/include' ZZIP_LIBS='-L$LOCAL_PATH/../../../obj/local/armeabi -lzzip' ./configure --host=arm-linux-androideabi "
 fi
 
 make -C milkytracker-0.90.85 && mv -f milkytracker-0.90.85/src/tracker/milkytracker libapplication.so
diff --git a/project/jni/application/milkytracker/AndroidData/MilkyTracker-ExampleSongs.zip b/project/jni/application/milkytracker/AndroidData/MilkyTracker-ExampleSongs.zip
new file mode 100644
index 000000000..01db24835
Binary files /dev/null and b/project/jni/application/milkytracker/AndroidData/MilkyTracker-ExampleSongs.zip differ
diff --git a/project/jni/application/milkytracker/AndroidData/logo.png b/project/jni/application/milkytracker/AndroidData/logo.png
new file mode 100644
index 000000000..49500f1eb
Binary files /dev/null and b/project/jni/application/milkytracker/AndroidData/logo.png differ
diff --git a/project/jni/application/milkytracker/AndroidData/milkytracker-data.zip b/project/jni/application/milkytracker/AndroidData/milkytracker-data.zip
deleted file mode 100644
index 15cb0ecb3..000000000
Binary files a/project/jni/application/milkytracker/AndroidData/milkytracker-data.zip and /dev/null differ
diff --git a/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff b/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff
index a0e7d8b7c..1f9123617 100644
--- a/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff
+++ b/project/jni/application/milkytracker/milkytrackey-0.90.85-android.diff
@@ -102,7 +102,7 @@ diff -ru orig/milkytracker-0.90.85/configure milkytracker-0.90.85/configure
    rm -f conf.sdltest
  
 -CPPFLAGS="$CPPFLAGS -D__FORCE_SDL_AUDIO__"
-+CPPFLAGS="$CPPFLAGS -D__FORCE_SDL_AUDIO__ -D__LOWRES__"
++CPPFLAGS="$CPPFLAGS -D__FORCE_SDL_AUDIO__ -D__LOWRES__ -D__LOWRES__"
  
  # Check that SDL supports the X11 wm
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether SDL supports X11" >&5
diff --git a/project/jni/application/src b/project/jni/application/src
index 8193e5e18..02b189579 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-vcmi
\ No newline at end of file
+grafx2
\ No newline at end of file