diff --git a/Makefile b/Makefile
index c903ae567d..407a1a3580 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,13 @@ endif
 
 ifeq ($(ARCH),riscv64gc)
 	override ARCH:=riscv64
+	GNU_TARGET=riscv64-unknown-redox
+else ifeq($(ARCH),i686)
+	override ARCH:=i586
+	GNU_TARGET=i686-unknown-redox
+else
+	GNU_TARGET=$(ARCH)-unknown-redox
 endif
-GNU_TARGET=$(ARCH)-unknown-redox
 
 
 all: $(BUILD)/kernel $(BUILD)/kernel.sym
diff --git a/linkers/i686.ld b/linkers/i586.ld
similarity index 100%
rename from linkers/i686.ld
rename to linkers/i586.ld
diff --git a/targets/i686-unknown-kernel.json b/targets/i586-unknown-kernel.json
similarity index 100%
rename from targets/i686-unknown-kernel.json
rename to targets/i586-unknown-kernel.json