diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml
index 9067c22e2..8b4557fcf 100644
--- a/project/AndroidManifest.xml
+++ b/project/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="net.sourceforge.jooleem"
-      android:versionCode="01404"
-      android:versionName="0.1.4.04 - added HW acceleration"
+      package="org.scummvm.sdl"
+      android:versionCode="12001"
+      android:versionName="1.2.0.01"
       android:installLocation="preferExternal"
 >
     <application android:label="@string/app_name" 
diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index 749de8512..d0ce59465 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -1,6 +1,6 @@
 
 # The namespace in Java file, with dots replaced with underscores
-SDL_JAVA_PACKAGE_PATH := net_sourceforge_jooleem
+SDL_JAVA_PACKAGE_PATH := org_scummvm_sdl
 
 # Path to shared libraries - Android 1.6 cannot load them properly, thus we have to specify absolute path here
 # SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib
@@ -10,7 +10,7 @@ SDL_JAVA_PACKAGE_PATH := net_sourceforge_jooleem
 # Typically /sdcard/alienblaster 
 # Or /data/data/de.schwardtnet.alienblaster/files if you're planning to unpack data in application private folder
 # Your application will just set current directory there
-SDL_CURDIR_PATH := net.sourceforge.jooleem
+SDL_CURDIR_PATH := org.scummvm.sdl
 
 # Android Dev Phone G1 has trackball instead of cursor keys, and 
 # sends trackball movement events as rapid KeyDown/KeyUp events,
@@ -25,17 +25,17 @@ SDL_VIDEO_RENDER_RESIZE := 1
 
 SDL_VIDEO_RENDER_RESIZE_KEEP_ASPECT := 0
 
-COMPILED_LIBRARIES := sdl_mixer sdl_image sdl_ttf
+COMPILED_LIBRARIES := mad tremor flac ogg jpeg png
 
-APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2
+APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2 -DUSE_OSD -DUSE_RGB_COLOR -DUNIX -DUSE_VORBIS -DUSE_TREMOR -DUSE_FLAC -DUSE_MAD -DUSE_PNG -DUSE_JPEG -DUSE_ZLIB -DENABLE_SCUMM -DENABLE_SCUMM_7_8 -DENABLE_HE -DENABLE_AGI -DENABLE_AGOS -DENABLE_AGOS2 -DENABLE_CINE -DENABLE_CRUISE -DENABLE_DRACI -DENABLE_DRASCULA -DENABLE_GOB -DENABLE_GROOVIE -DENABLE_GROOVIE2 -DENABLE_HUGO -DENABLE_KYRA -DENABLE_LOL -DENABLE_LASTEXPRESS -DENABLE_LURE -DENABLE_M4 -DENABLE_MADE -DENABLE_MOHAWK -DENABLE_PARALLACTION -DENABLE_QUEEN -DENABLE_SAGA -DENABLE_IHNM -DENABLE_SAGA2 -DENABLE_SCI -DENABLE_SCI32 -DENABLE_SKY -DENABLE_SWORD1 -DENABLE_SWORD2 -DENABLE_SWORD25 -DENABLE_TESTBED -DENABLE_TEENAGENT -DENABLE_TINSEL -DENABLE_TOON -DENABLE_TOUCHE -DENABLE_TUCKER
 
 APPLICATION_ADDITIONAL_LDFLAGS := 
 
-APPLICATION_SUBDIRS_BUILD := 
+APPLICATION_SUBDIRS_BUILD := scummvm scummvm/backends scummvm/backends/platform/sdl scummvm/backends/keymapper/* scummvm/backends/events/* scummvm/backends/plugins/sdl scummvm/backends/saves/posix scummvm/backends/saves/default scummvm/backends/saves scummvm/backends/timer/default scummvm/backends/fs/posix scummvm/backends/fs scummvm/backends/vkeybd/* scummvm/backends/midi/* scummvm/base/* scummvm/common/* scummvm/engines/* scummvm/graphics/* scummvm/gui/* scummvm/sound/*
 
 APPLICATION_CUSTOM_BUILD_SCRIPT := 
 
-SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN
+SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=SPACE -DSDL_ANDROID_KEYCODE_1=RETURN -DSDL_ANDROID_KEYCODE_2=LCTRL -DSDL_ANDROID_KEYCODE_3=LALT -DSDL_ANDROID_KEYCODE_4=SPACE
 
 SDL_VERSION := 1.2
 
diff --git a/project/jni/Application.mk b/project/jni/Application.mk
index 46593844b..70daf426d 100644
--- a/project/jni/Application.mk
+++ b/project/jni/Application.mk
@@ -2,7 +2,7 @@ APP_PROJECT_PATH := $(call my-dir)/..
 
 # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces
 
-APP_MODULES := application sdl-1.2 sdl_main stlport jpeg png ogg flac vorbis freetype sdl_mixer sdl_image sdl_ttf
+APP_MODULES := application sdl-1.2 sdl_main stlport jpeg png ogg flac vorbis freetype mad tremor flac ogg jpeg png
 
 # To filter out static libs from all libs in makefile
 APP_AVAILABLE_STATIC_LIBS := jpeg png tremor freetype xerces ogg tremor vorbis flac
diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index d10813b25..bc05a1c50 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -9,7 +9,7 @@ APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/$(APPDI
 ifneq ($(APPLICATION_SUBDIRS_BUILD),)
 APPLICATION_SUBDIRS_BUILD_NONRECURSIVE := $(addprefix $(APPDIR)/, $(filter-out %/*, $(APPLICATION_SUBDIRS_BUILD)))
 APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(patsubst %/*, %, $(filter %/*,$(APPLICATION_SUBDIRS_BUILD)))
-APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(foreach FINDDIR, $(APPLICATION_SUBDIRS_BUILD_RECURSIVE), $(shell find $(LOCAL_PATH)/$(APPDIR)/$(FINDDIR) -type d))
+APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(foreach FINDDIR, $(APPLICATION_SUBDIRS_BUILD_RECURSIVE), $(shell find $(LOCAL_PATH)/$(APPDIR)/$(FINDDIR) -path '*/.svn' -prune -o -type d -print))
 APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(patsubst $(LOCAL_PATH)/%, %, $(APPLICATION_SUBDIRS_BUILD_RECURSIVE) )
 APP_SUBDIRS := $(APPLICATION_SUBDIRS_BUILD_NONRECURSIVE) $(APPLICATION_SUBDIRS_BUILD_RECURSIVE)
 endif
@@ -42,6 +42,7 @@ LOCAL_CFLAGS += \
 				-I$(LOCAL_PATH)/../flac/include \
 				-I$(LOCAL_PATH)/../ogg/include \
 				-I$(LOCAL_PATH)/../vorbis/include \
+				-I$(LOCAL_PATH)/../mad/include \
 				-I$(LOCAL_PATH)/..
 
 LOCAL_CFLAGS += $(APPLICATION_ADDITIONAL_CFLAGS)
diff --git a/project/jni/application/scummvm/AndroidAppSettings.cfg b/project/jni/application/scummvm/AndroidAppSettings.cfg
new file mode 100644
index 000000000..cd6885a7d
--- /dev/null
+++ b/project/jni/application/scummvm/AndroidAppSettings.cfg
@@ -0,0 +1,30 @@
+# The application settings for Android libSDL port
+AppSettingVersion=12
+LibSdlVersion=1.2
+AppName="ScummVM"
+AppFullName=org.scummvm.sdl
+ScreenOrientation=h
+InhibitSuspend=n
+AppDataDownloadUrl="Data files size is 3 Mb|https://sites.google.com/site/xpelyax/Home/scummvm-1.2.0-data-1.zip?attredirects=0&d=1^Lure of the Temptress (10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download"
+SdlVideoResize=y
+SdlVideoResizeKeepAspect=n
+NeedDepthBuffer=n
+AppUsesMouse=y
+AppNeedsArrowKeys=y
+AppUsesJoystick=n
+AppHandlesJoystickSensitivity=n
+AppUsesMultitouch=n
+NonBlockingSwapBuffers=n
+RedefinedKeys="SPACE RETURN LCTRL LALT SPACE"
+AppTouchscreenKeyboardKeysAmount=0
+AppTouchscreenKeyboardKeysAmountAutoFire=0
+MultiABI=n
+AppVersionCode=12001
+AppVersionName="1.2.0.01"
+CompiledLibraries="mad tremor flac ogg jpeg png"
+CustomBuildScript=n
+AppCflags='-finline-functions -O2 -DUSE_OSD -DUSE_RGB_COLOR -DUNIX -DUSE_VORBIS -DUSE_TREMOR -DUSE_FLAC -DUSE_MAD -DUSE_PNG -DUSE_JPEG -DUSE_ZLIB -DENABLE_SCUMM -DENABLE_SCUMM_7_8 -DENABLE_HE -DENABLE_AGI -DENABLE_AGOS -DENABLE_AGOS2 -DENABLE_CINE -DENABLE_CRUISE -DENABLE_DRACI -DENABLE_DRASCULA -DENABLE_GOB -DENABLE_GROOVIE -DENABLE_GROOVIE2 -DENABLE_HUGO -DENABLE_KYRA -DENABLE_LOL -DENABLE_LASTEXPRESS -DENABLE_LURE -DENABLE_M4 -DENABLE_MADE -DENABLE_MOHAWK -DENABLE_PARALLACTION -DENABLE_QUEEN -DENABLE_SAGA -DENABLE_IHNM -DENABLE_SAGA2 -DENABLE_SCI -DENABLE_SCI32 -DENABLE_SKY -DENABLE_SWORD1 -DENABLE_SWORD2 -DENABLE_SWORD25 -DENABLE_TESTBED -DENABLE_TEENAGENT -DENABLE_TINSEL -DENABLE_TOON -DENABLE_TOUCHE -DENABLE_TUCKER'
+AppLdflags=''
+AppSubdirsBuild='scummvm scummvm/backends scummvm/backends/platform/sdl scummvm/backends/keymapper/* scummvm/backends/events/* scummvm/backends/plugins/sdl scummvm/backends/saves/posix scummvm/backends/saves/default scummvm/backends/saves scummvm/backends/timer/default scummvm/backends/fs/posix scummvm/backends/fs scummvm/backends/vkeybd/* scummvm/backends/midi/* scummvm/base/* scummvm/common/* scummvm/engines/* scummvm/graphics/* scummvm/gui/* scummvm/sound/*'
+AppUseCrystaXToolchain=n
+ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/application/scummvm/icon.png b/project/jni/application/scummvm/icon.png
new file mode 100644
index 000000000..03bc753aa
Binary files /dev/null and b/project/jni/application/scummvm/icon.png differ
diff --git a/project/jni/application/scummvm/readme.txt b/project/jni/application/scummvm/readme.txt
new file mode 100644
index 000000000..cbc537887
--- /dev/null
+++ b/project/jni/application/scummvm/readme.txt
@@ -0,0 +1,8 @@
+To compile ScummVM add the ScummVM SVN to directory "scummvm" (or make a symlink to it),
+then from dir 'project/jni/application' execute commands
+
+rm src
+ln -s scummvm src
+
+Then go to project root and launch 'build.sh' - that should be it.
+You need to have Android SDK 2.2 and NDK r4b installed in your PATH.
diff --git a/project/jni/application/scummvm/scummvm b/project/jni/application/scummvm/scummvm
new file mode 120000
index 000000000..3c7c69dce
--- /dev/null
+++ b/project/jni/application/scummvm/scummvm
@@ -0,0 +1 @@
+../../../../../scummvm/
\ No newline at end of file
diff --git a/project/jni/mad/Android.mk b/project/jni/mad/Android.mk
index 9e9dafa1b..1d613311c 100644
--- a/project/jni/mad/Android.mk
+++ b/project/jni/mad/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := mad
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) \
+LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include \
 					-DFPM_64BIT -DOPT_SPEED \
 					-DSTDC_HEADERS -DHAVE_UNISTD_H \
 					-DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 \
diff --git a/project/jni/mad/mad.h b/project/jni/mad/include/mad.h
similarity index 100%
rename from project/jni/mad/mad.h
rename to project/jni/mad/include/mad.h
diff --git a/project/res/values/strings.xml b/project/res/values/strings.xml
index d7285ec3f..28304933c 100644
--- a/project/res/values/strings.xml
+++ b/project/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Jooleem</string>
+    <string name="app_name">ScummVM</string>
 
 
     <string name="init">Initializing</string>
diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java
index f3a02cd76..bd6ae2735 100644
--- a/project/src/Accelerometer.java
+++ b/project/src/Accelerometer.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package net.sourceforge.jooleem;
+package org.scummvm.sdl;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/project/src/Audio.java b/project/src/Audio.java
index 09f29ac0c..1022b6e99 100644
--- a/project/src/Audio.java
+++ b/project/src/Audio.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package net.sourceforge.jooleem;
+package org.scummvm.sdl;
 
 
 import android.app.Activity;
diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java
index 69e0311aa..ad977c126 100644
--- a/project/src/DataDownloader.java
+++ b/project/src/DataDownloader.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package net.sourceforge.jooleem;
+package org.scummvm.sdl;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java
index 447b95e6d..cf1608a4b 100644
--- a/project/src/GLSurfaceView_SDL.java
+++ b/project/src/GLSurfaceView_SDL.java
@@ -18,7 +18,7 @@
    fixed with a hammer and rasp to work with libSDL port */
 
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package net.sourceforge.jooleem;
+package org.scummvm.sdl;
 
 import java.io.Writer;
 import java.util.ArrayList;
diff --git a/project/src/Globals.java b/project/src/Globals.java
index 750661c8b..25f071470 100644
--- a/project/src/Globals.java
+++ b/project/src/Globals.java
@@ -1,14 +1,14 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere
-package net.sourceforge.jooleem;
+package org.scummvm.sdl;
 
 import android.app.Activity;
 import android.content.Context;
 
 class Globals {
-	public static String ApplicationName = "Jooleem";
+	public static String ApplicationName = "ScummVM";
 
 	// Should be zip file
-	public static String DataDownloadUrl = "Data files are 10 Mb|http://sourceforge.net/projects/libsdl-android/files/Jooleem/jooleem_0.1.4_data.zip/download|http://sites.google.com/site/xpelyax/Home/jooleem_0.1.4_data.zip?attredirects=0%26d=1|http://sitesproxy.goapk.com/site/xpelyax/Home/jooleem_0.1.4_data.zip";
+	public static String DataDownloadUrl = "Data files size is 3 Mb|https://sites.google.com/site/xpelyax/Home/scummvm-1.2.0-data-1.zip?attredirects=0%26d=1^Lure of the Temptress (10 Mb)|http://sourceforge.net/projects/scummvm/files/extras/Lure%20of%20the%20Temptress/lure-1.1.zip/download";
 
 	// Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D
 	public static boolean NeedDepthBuffer = false;
@@ -24,7 +24,7 @@ class Globals {
 
 	public static boolean AppUsesMouse = true;
 
-	public static boolean AppNeedsArrowKeys = false;
+	public static boolean AppNeedsArrowKeys = true;
 
 	public static boolean AppUsesJoystick = false;
 
@@ -56,5 +56,5 @@ class Globals {
 }
 
 class LoadLibrary {
-	public LoadLibrary() { System.loadLibrary("sdl-1.2"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); System.loadLibrary("sdl_ttf"); };
+	public LoadLibrary() { System.loadLibrary("sdl-1.2"); System.loadLibrary("mad"); };
 }
diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java
index c11b33d6b..c34dec68d 100644
--- a/project/src/MainActivity.java
+++ b/project/src/MainActivity.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package net.sourceforge.jooleem;
+package org.scummvm.sdl;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/project/src/Settings.java b/project/src/Settings.java
index 9d3147d94..9d5e84ce2 100644
--- a/project/src/Settings.java
+++ b/project/src/Settings.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package net.sourceforge.jooleem;
+package org.scummvm.sdl;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/project/src/Video.java b/project/src/Video.java
index ed338d3f5..cf0a6c354 100644
--- a/project/src/Video.java
+++ b/project/src/Video.java
@@ -1,5 +1,5 @@
 // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
-package net.sourceforge.jooleem;
+package org.scummvm.sdl;
 
 import javax.microedition.khronos.opengles.GL10;