diff --git a/AUTHORS b/AUTHORS
index 28586eec..6f518ec2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -215,6 +215,7 @@ Thanar2
 thaspel
 theo77186
 Ting-Hsuan Huang (fffelix-huang)
+Tobias Steinmann
 Tomasz Sobczyk (Sopel97)
 Tom Truscott
 Tom Vijlbrief (tomtor)
diff --git a/src/Makefile b/src/Makefile
index 761b4086..ac354c7b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -521,6 +521,14 @@ ifeq ($(COMP),ndk)
 			STRIP=llvm-strip
 		endif
 	endif
+	ifeq ($(arch),x86_64)
+		CXX=x86_64-linux-android21-clang++
+		ifneq ($(shell which x86_64-linux-android-strip 2>/dev/null),)
+			STRIP=x86_64-linux-android-strip
+		else
+			STRIP=llvm-strip
+		endif
+	endif
 	LDFLAGS += -static-libstdc++ -pie -lm -latomic
 endif