diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 0000000..570b6f4
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,6 @@
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.x86_64-apple-darwin]
+linker = "x86_64-apple-darwin16-clang"
+ar = "x86_64-apple-darwin16-ar"
diff --git a/Makefile b/Makefile
index 2e2636d..ec41668 100644
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,26 @@ all:
 	$(MAKE) build
 
 build:
-	cargo build -p warp-runner --release --target x86_64-unknown-linux-musl
-	strip target/x86_64-unknown-linux-musl/release/warp-runner
+	cargo build -p warp-runner --release --target x86_64-unknown-linux-gnu
+	strip target/x86_64-unknown-linux-gnu/release/warp-runner
 
-	CC=x86_64-apple-darwin15-clang cargo build -p warp-runner --release --target x86_64-apple-darwin
-	x86_64-apple-darwin15-strip target/x86_64-apple-darwin/release/warp-runner
+	cargo build -p warp-runner --release --target aarch64-unknown-linux-gnu
+	aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/warp-runner
+
+	cargo build -p warp-runner --release --target x86_64-apple-darwin
+	x86_64-apple-darwin16-strip target/x86_64-apple-darwin/release/warp-runner
 
 	cargo build -p warp-runner --release --target x86_64-pc-windows-gnu
 	strip target/x86_64-pc-windows-gnu/release/warp-runner.exe
 
-	cargo build -p warp-packer --release --target x86_64-unknown-linux-musl
-	strip target/x86_64-unknown-linux-musl/release/warp-packer
+	cargo build -p warp-packer --release --target x86_64-unknown-linux-gnu
+	strip target/x86_64-unknown-linux-gnu/release/warp-packer
 
-	CC=x86_64-apple-darwin15-clang cargo build -p warp-packer --release --target x86_64-apple-darwin
-	x86_64-apple-darwin15-strip target/x86_64-apple-darwin/release/warp-packer
+	cargo build -p warp-packer --release --target aarch64-unknown-linux-gnu
+	aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/warp-packer
+
+	cargo build -p warp-packer --release --target x86_64-apple-darwin
+	x86_64-apple-darwin16-strip target/x86_64-apple-darwin/release/warp-packer
 
 	cargo build -p warp-packer --release --target x86_64-pc-windows-gnu
 	strip target/x86_64-pc-windows-gnu/release/warp-packer.exe
diff --git a/warp-packer/src/main.rs b/warp-packer/src/main.rs
index f71cc83..35fdc19 100644
--- a/warp-packer/src/main.rs
+++ b/warp-packer/src/main.rs
@@ -22,7 +22,11 @@ lazy_static! {
         let mut m = HashMap::new();
         m.insert(
             "linux-x64",
-            include_bytes!("../../target/x86_64-unknown-linux-musl/release/warp-runner").as_slice(),
+            include_bytes!("../../target/x86_64-unknown-linux-gnu/release/warp-runner").as_slice(),
+        );
+        m.insert(
+            "linux-aarch64",
+            include_bytes!("../../target/aarch64-unknown-linux-gnu/release/warp-runner").as_slice(),
         );
         m.insert(
             "macos-x64",