diff --git a/lucky/Makefile b/lucky/Makefile
index 367d66f..4fda085 100644
--- a/lucky/Makefile
+++ b/lucky/Makefile
@@ -17,30 +17,29 @@ endif
 ifeq ($(ARCH),mips)
 	LUCKY_ARCH:=mips_softfloat
 endif
-ifeq ($(ARCH),i386)
-	LUCKY_ARCH:=i386
+ifeq ($(ARCH),arm)
+	LUCKY_ARCH:=armv5
 endif
-ifeq ($(ARCH),x86_64)
-	LUCKY_ARCH:=x86_64
+ifeq ($(BOARD),kirkwood)
+	LUCKY_ARCH:=armv5
 endif
-ifeq ($(ARCH),arm)
+ifeq ($(ARCH),armv7)
 	LUCKY_ARCH:=armv7
 endif
-
-ifeq ($(ARCH),arm64)
+ifeq ($(ARCH),aarch64)
 	LUCKY_ARCH:=arm64
 endif
-ifeq ($(BOARD),bcm53xx)
-	LUCKY_ARCH:=armv7
-ifeq ($(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))),)
-	LUCKY_ARCH:=armv5
+ifeq ($(ARCH),arm64)
+	LUCKY_ARCH:=arm64
 endif
+ifeq ($(ARCH),armv8)
+	LUCKY_ARCH:=arm64
 endif
-ifeq ($(BOARD),kirkwood)
-	LUCKY_ARCH:=armv5
+ifeq ($(ARCH),i386)
+	LUCKY_ARCH:=i386
 endif
-ifeq ($(ARCH),aarch64)
-	LUCKY_ARCH:=arm64
+ifeq ($(ARCH),x86_64)
+	LUCKY_ARCH:=x86_64
 endif
 
 PKG_LICENSE:=GPL-3.0-only