diff --git a/Makefile b/Makefile
index 8198055..6e5f596 100644
--- a/Makefile
+++ b/Makefile
@@ -34,32 +34,26 @@ ifeq ($(PARENT_OUTPUT_DIR),.)
 endif
 
 # Find the N64 toolchain, for creating object files.
-ifneq (, $(shell which mips64-linux-gnuabi64-as))
-  AS := mips64-linux-gnuabi64-as
-else
-ifneq (, $(shell which mips64-linux-gnu-as))
+ifneq (, $(shell which mips64-elf-as)
+  AS := mips64-elf-as
+else ifneq (, $(shell which mips-n64-as)
+  AS := mips-n64-as
+else ifneq (, $(shell which mips64-as)
+  AS := mips64-as
+else ifneq (, $(shell which mips-linux-gnu-as)
+  AS := mips-linux-gnu-as
+else ifneq (, $(shell which mips64-linux-gnu-as)
   AS := mips64-linux-gnu-as
-else
-ifneq (, $(shell which mips64-ultra-elf-as))
+else ifneq (, $(shell which mips-as)
+  AS := mips-as
+else ifneq (, $(shell which mips64-linux-gnuabi64-as)
+  AS := mips64-linux-gnuabi64-as
+else ifneq (, $(shell which mips64-ultra-elf-as)
   AS := mips64-ultra-elf-as
 else
-ifneq (, $(shell which mips64-elf-as))
-  AS := mips64-elf-as
-else
-ifneq (, $(shell which mips64-as))
-  AS := mips64-as
-else
-ifneq (, $(shell which mips-linux-gnu-as))
-  AS := mips-linux-gnu-as
-else
-  $(warning Could not find N64 linker, not building object files)
+  $(warning Could not find N64 assembler, not building object files)
   AS := 
 endif
-endif
-endif
-endif
-endif
-endif
 
 NO_COL := \033[0m
 RED    := \033[0;31m