diff --git a/build.sh b/build.sh
index 8cba6785..23f047a8 100755
--- a/build.sh
+++ b/build.sh
@@ -81,7 +81,7 @@ if [ -z "$ARCH" ] && [ -n "$FILESYSTEM_CONFIG" ]; then
         aarch64) : ;;
         riscv64gc) : ;;
         i586) : ;;
-        \?) ARCH=""; echo "Unknown Architecture, please specify x86_64, aarch64, risc64gc or i586";;
+        \?) ARCH=""; echo "Unknown Architecture, please specify x86_64, aarch64, riscv64gc or i586";;
     esac
 fi
 
diff --git a/mk/config.mk b/mk/config.mk
index 9ac7c0eb..9b56cb78 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -23,6 +23,10 @@ REPO_NONSTOP?=0
 REPO_OFFLINE?=0
 ## Do not strip debug info for local build
 REPO_DEBUG?=0
+## Old config value that need to be corrected
+ifeq ($(ARCH),i686)
+	ARCH=i586
+endif
 ## Select filesystem config
 ifeq ($(BOARD),)
 FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml
@@ -124,10 +128,6 @@ export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt
 ifeq ($(ARCH),riscv64gc)
 	export TARGET=riscv64gc-unknown-redox
 	export GNU_TARGET=riscv64-unknown-redox
-else ifeq ($(ARCH),i686)
-	ARCH=i586
-	export TARGET=i586-unknown-redox
-	export GNU_TARGET=i586-unknown-redox
 else
 	export TARGET=$(ARCH)-unknown-redox
 	export GNU_TARGET=$(ARCH)-unknown-redox