diff --git a/build/android/Makefile b/build/android/Makefile
index b5fecbfc2..616fdcfc6 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -664,7 +664,10 @@ assets : $(ASSETS_TIMESTAMP)
 	ls -R | grep ":$$" | sed -e 's/:$$//' -e 's/\.//' -e 's/^\///' > "index.txt"; \
 	find MultiCraft >"filelist.txt";                                             \
 	cp ${ROOT}/${ASSETS_TIMESTAMP} ${ROOT}/${ASSETS_TIMESTAMP}.old;            \
-	zip -r -q ${ROOT}/assets/Files.zip ${ROOT}/assets/MultiCraft/	           \
+	pushd ${ROOT}/assets/;		\
+	echo "Creating Files.zip";	\
+	zip -r -X -q Files.zip MultiCraft/*;	           \
+	popd;							\
 	else                                                                       \
 		echo "nothing to be done for assets";                                  \
 	fi
diff --git a/src/config.h b/src/config.h
index 933165b2c..46032cc3f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,7 +13,7 @@
 #if defined USE_CMAKE_CONFIG_H
 	#include "cmake_config.h"
 #elif defined (__ANDROID__) || defined (ANDROID)
-	#define PROJECT_NAME "multicraft"
+	#define PROJECT_NAME "MultiCraft"
 	#define PROJECT_NAME_C "MultiCraft"
 	#define STATIC_SHAREDIR ""
 	#include "android_version.h"
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 28bab7da3..dd65d06ec 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -322,7 +322,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("enable_particles", "false");
 	settings->setDefault("video_driver", "ogles1");
 	settings->setDefault("touchtarget", "true");
-	settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME "/tmp/");
+	settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME_C "/tmp/");
 	settings->setDefault("touchscreen_threshold","20");
 	settings->setDefault("smooth_lighting", "false");
 	settings->setDefault("max_simultaneous_block_sends_per_client", "3");