diff --git a/client/Makefile b/client/Makefile
index 31bd9f49..0f52f4da 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -39,10 +39,10 @@ endif
 
 ifeq ($(TARGET), ANDROID)
 
-CXX       = $(NDK_DIR)/bin/arm-linux-androideabi-clang++
-STRIP     = $(NDK_DIR)/bin/arm-linux-androideabi-strip
-CXXFLAGS += -march=armv7 -pthread -DANDROID -DNO_CPP11_STRING -fPIC -DHAS_TREMOR -DHAS_OPENSL -I$(NDK_DIR)/include
-LDFLAGS   = -L$(NDK_DIR)/lib -pie -lvorbisidec -logg -lFLAC -lOpenSLES 
+CXX       = $(PROGRAM_PREFIX)clang++
+STRIP     = $(PROGRAM_PREFIX)strip
+CXXFLAGS += -pthread -DANDROID -DNO_CPP11_STRING -fPIC -DHAS_TREMOR -DHAS_OPENSL -I$(NDK_DIR)/include
+LDFLAGS   = -L$(NDK_DIR)/lib -pie -lvorbisidec -logg -lFLAC -lOpenSLES -latomic
 OBJ      += player/openslPlayer.o 
 
 else ifeq ($(TARGET), OPENWRT)
@@ -87,6 +87,18 @@ ifeq ($(TARGET), ANDROID)
 ifndef NDK_DIR
 	$(error android NDK_DIR is not set)
 endif
+ifndef ARCH
+	$(error ARCH is not set (arm, mips, x86))
+endif
+ifeq ($(ARCH), x86)
+	$(eval PROGRAM_PREFIX:=$(NDK_DIR)/bin/i686-linux-android-)
+else ifeq ($(ARCH), mips)
+	$(eval CXXFLAGS:=$(CXXFLAGS) -DIS_BIG_ENDIAN)
+	$(eval PROGRAM_PREFIX:=$(NDK_DIR)/bin/mipsel-linux-android-)
+else
+	$(eval CXXFLAGS:=$(CXXFLAGS) -march=armv7)
+	$(eval PROGRAM_PREFIX:=$(NDK_DIR)/bin/arm-linux-androideabi-)
+endif
 endif
 
 $(TARGET): $(OBJ)
@@ -97,7 +109,7 @@ $(TARGET): $(OBJ)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 clean:
-	rm -rf $(BIN) $(OBJ) *~
+	rm -rf $(BIN) $(OBJ) *~ player/*.o
 
 .PHONY: dpkg
 #sudo apt-get install build-essential debhelper dh-make dh-systemd quilt fakeroot lintian
diff --git a/client/build_android.sh b/client/build_android.sh
index aa24d830..0fa5b8d3 100755
--- a/client/build_android.sh
+++ b/client/build_android.sh
@@ -1,5 +1,9 @@
-export NDK_DIR="/home/johannes/Develop/android-toolchain-arm-14"
-export ADD_CFLAGS="-march=armv7"
+export NDK_DIR="/home/johannes/Develop/android-toolchain-arm"
+export ARCH=arm
 make clean; make TARGET=ANDROID -j 4; cp ./snapclient ../android/Snapcast/src/main/assets/bin/armeabi/
-export ADD_CFLAGS="-march=armv7-a"
-make clean; make TARGET=ANDROID -j 4; cp ./snapclient ../android/Snapcast/src/main/assets/bin/armeabi-v7a/
+export NDK_DIR="/home/johannes/Develop/android-toolchain-mips"
+export ARCH=mips
+make clean; make TARGET=ANDROID -j 4; cp ./snapclient ../android/Snapcast/src/main/assets/bin/mips/
+export NDK_DIR="/home/johannes/Develop/android-toolchain-x86"
+export ARCH=x86
+make clean; make TARGET=ANDROID -j 4; cp ./snapclient ../android/Snapcast/src/main/assets/bin/x86/
diff --git a/externals/Makefile b/externals/Makefile
index e8357949..834d885d 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -32,7 +32,7 @@ ifndef NDK_DIR
 	$(error android NDK_DIR is not set)
 endif
 ifndef ARCH
-	export ARCH=arm
+	$(error ARCH is not set (arm, mips, x86))
 endif
 ifeq ($(ARCH), x86)
 	$(eval CPPFLAGS:=-DLITTLE_ENDIAN=1234 -DBIG_ENDIAN=4321 -DBYTE_ORDER=LITTLE_ENDIAN)