diff --git a/project/jni/Android.mk b/project/jni/Android.mk
index 3f8773336..af498d564 100644
--- a/project/jni/Android.mk
+++ b/project/jni/Android.mk
@@ -1,44 +1,3 @@
-
-# The namespace in Java file, with dots replaced with underscores
-SDL_JAVA_PACKAGE_PATH := net_sourceforge_clonekeenplus
-
-# 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
-
-# Path to files with application data - they should be downloaded from Internet on first app run inside
-# Java sources, or unpacked from resources (TODO)
-# 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.clonekeenplus
-
-# Android Dev Phone G1 has trackball instead of cursor keys, and 
-# sends trackball movement events as rapid KeyDown/KeyUp events,
-# this will make Up/Down/Left/Right key up events with X frames delay,
-# so if application expects you to press and hold button it will process the event correctly.
-# TODO: create a libsdl config file for that option and for key mapping/on-screen keyboard
-SDL_TRACKBALL_KEYUP_DELAY := 1
-
-# If the application designed for higher screen resolution enable this to get the screen
-# resized in HW-accelerated way, however it eats a tiny bit of CPU
-SDL_VIDEO_RENDER_RESIZE := 1
-
-SDL_VIDEO_RENDER_RESIZE_KEEP_ASPECT := 0
-
-COMPILED_LIBRARIES := tremor ogg
-
-APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2 -DTREMOR=1 -DBUILD_TYPE=LINUX32 -DTARGET_LNX=1 -Werror=strict-aliasing -Werror=cast-align -Werror=pointer-arith -Werror=address
-
-APPLICATION_ADDITIONAL_LDFLAGS := -ltremor
-
-APPLICATION_SUBDIRS_BUILD := src/*
-
-APPLICATION_CUSTOM_BUILD_SCRIPT := 
-
-SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=LCTRL -DSDL_ANDROID_KEYCODE_1=LALT -DSDL_ANDROID_KEYCODE_2=SPACE -DSDL_ANDROID_KEYCODE_3=RETURN -DSDL_ANDROID_KEYCODE_4=RETURN
-
-SDL_VERSION := 1.2
-
 # If SDL_Mixer should link to libMAD
 SDL_MIXER_USE_LIBMAD :=
 ifneq ($(strip $(filter mad, $(COMPILED_LIBRARIES))),)
diff --git a/project/jni/SettingsTemplate.mk b/project/jni/SettingsTemplate.mk
index 988e2a2e8..7899c80df 100644
--- a/project/jni/SettingsTemplate.mk
+++ b/project/jni/SettingsTemplate.mk
@@ -11,9 +11,6 @@ APP_ABI := armeabi
 # The namespace in Java file, with dots replaced with underscores
 SDL_JAVA_PACKAGE_PATH := net_sourceforge_clonekeenplus
 
-# 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
-
 # Path to files with application data - they should be downloaded from Internet on first app run inside
 # Java sources, or unpacked from resources (TODO)
 # Typically /sdcard/alienblaster 
diff --git a/project/jni/application/Android.mk b/project/jni/application/Android.mk
index 11fd164d7..860f99bc2 100644
--- a/project/jni/application/Android.mk
+++ b/project/jni/application/Android.mk
@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := application
 APPDIR := $(shell readlink $(LOCAL_PATH)/src)
 
-APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/$(APPDIR) -type d))
+APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/$(APPDIR) -path '*/.svn' -prune -o -type d -print))
 ifneq ($(APPLICATION_SUBDIRS_BUILD),)
 APPLICATION_SUBDIRS_BUILD_NONRECURSIVE := $(addprefix $(APPDIR)/, $(filter-out %/*, $(APPLICATION_SUBDIRS_BUILD)))
 APPLICATION_SUBDIRS_BUILD_RECURSIVE := $(patsubst %/*, %, $(filter %/*,$(APPLICATION_SUBDIRS_BUILD)))