diff --git a/Makefile b/Makefile
index 5ed296b2a4..5703ee2f94 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ else
 endif
 
 ifeq ($(ARCH),riscv64gc)
-	ARCH:=riscv64
+	override ARCH:=riscv64
 endif
 GNU_TARGET=$(ARCH)-unknown-redox
 
diff --git a/targets/riscv64-unknown-kernel.json b/targets/riscv64-unknown-kernel.json
index d3fbba508a..2dadf5e617 100644
--- a/targets/riscv64-unknown-kernel.json
+++ b/targets/riscv64-unknown-kernel.json
@@ -1,5 +1,6 @@
 {
     "llvm-target": "riscv64-unknown-none",
+    "llvm-abiname": "lp64d",
     "target-endian": "little",
     "target-pointer-width": "64",
     "target-c-int-width": "32",