diff --git a/client/build_android_all.sh b/client/build_android_all.sh
index a252fcdd..df2c8dd7 100755
--- a/client/build_android_all.sh
+++ b/client/build_android_all.sh
@@ -1,7 +1,7 @@
 #/bin/sh
 
-export NDK_DIR_ARM="/home/johannes/Develop/android-toolchain-arm"
-export NDK_DIR_MIPS="/home/johannes/Develop/android-toolchain-mips"
-export NDK_DIR_X86="/home/johannes/Develop/android-toolchain-x86"
+export NDK_DIR_ARM="$1-arm"
+export NDK_DIR_MIPS="$1-mips"
+export NDK_DIR_X86="$1-x86"
 
 ./build_android.sh
diff --git a/externals/Makefile b/externals/Makefile
index 834d885d..31418946 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -41,6 +41,7 @@ else ifeq ($(ARCH), mips)
 	$(eval CPPFLAGS:=-DLITTLE_ENDIAN=1234 -DBIG_ENDIAN=4321 -DBYTE_ORDER=BIG_ENDIAN)
 	$(eval PROGRAM_PREFIX:=$(NDK_DIR)/bin/mipsel-linux-android-)
 else
+	$(eval CPPFLAGS:=-U_ARM_ASSEM_)
 	$(eval PROGRAM_PREFIX:=$(NDK_DIR)/bin/arm-linux-androideabi-)
 endif
 	$(eval CC:=$(PROGRAM_PREFIX)clang)
@@ -49,6 +50,9 @@ endif
 
 flac: check-env
 	@cd flac; \
+	export CC="$(CC)"; \
+	export CXX="$(CXX)"; \
+	export CPPFLAGS="$(CPPFLAGS)"; \
 	./autogen.sh; \
 	./configure --host=$(ARCH) --disable-ogg --prefix=$(NDK_DIR); \
 	make; \
@@ -57,6 +61,9 @@ flac: check-env
 
 ogg: check-env
 	@cd ogg; \
+	export CC="$(CC)"; \
+	export CXX="$(CXX)"; \
+	export CPPFLAGS="$(CPPFLAGS)"; \
 	./autogen.sh; \
 	./configure --host=$(ARCH) --prefix=$(NDK_DIR); \
 	make; \
@@ -64,7 +71,10 @@ ogg: check-env
 	make clean;
 
 tremor:	check-env
-	cd tremor; \
+	@cd tremor; \
+	export CC="$(CC)"; \
+	export CXX="$(CXX)"; \
+	export CPPFLAGS="$(CPPFLAGS)"; \
 	./autogen.sh; \
 	./configure --host=$(ARCH) --prefix=$(NDK_DIR) --with-ogg=$(NDK_DIR); \
 	make; \