diff --git a/.gitignore b/.gitignore
index a5077343..a52f4cf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,7 @@ tags
 !/textures/base/
 /sounds/
 /mods/*
-!/mods/mods_here.txt
 /worlds/
-/world/
 
 ## Configuration/log files
 minetest.conf
diff --git a/build/android/AndroidManifest.xml.template b/build/android/AndroidManifest.xml.template
index 67546714..a661e1ba 100644
--- a/build/android/AndroidManifest.xml.template
+++ b/build/android/AndroidManifest.xml.template
@@ -3,7 +3,7 @@
     package="mobi.MultiCraft"
 	android:installLocation="auto"
     android:versionCode="###ANDROID_VERSION###"
-    android:versionName="###BASE_VERSION###.###ANDROID_VERSION###" >
+    android:versionName="###BASE_VERSION###" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/build/android/Makefile b/build/android/Makefile
index 7b6d81a7..510dddf5 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -51,7 +51,7 @@ TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
 TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch -lm_hard
 TARGET_ARCH = armv7
 CROSS_PREFIX = arm-linux-androideabi-
-COMPILER_VERSION = 4.8
+COMPILER_VERSION = 4.9
 HAVE_LEVELDB = 1
 
 ################################################################################
diff --git a/build/android/build.xml b/build/android/build.xml
index 50a3e95a..bd9404a7 100644
--- a/build/android/build.xml
+++ b/build/android/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Minetest" default="help">
+<project name="MultiCraft" default="help">
 	<property file="local.properties" />
 	<property file="ant.properties" />
 	<property environment="env" />
diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk
index b7ffc56a..38f9babc 100644
--- a/build/android/jni/Application.mk
+++ b/build/android/jni/Application.mk
@@ -1,6 +1,6 @@
 # NDK_TOOLCHAIN_VERSION := clang3.3
 
-APP_PLATFORM := android-9
+APP_PLATFORM := android-16
 APP_MODULES := minetest
 APP_STL := gnustl_static