diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 63d9ea52e3..92ffc7cc5a 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -1,11 +1,17 @@
 config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
 	bool
-	# see src/shared/architecture.h
-	default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
-		BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \
-		BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \
-		BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64 || \
-		BR2_aarch64 || BR2_m68k || BR2_arc
+	# see src/basic/architecture.h
+	default y if BR2_arc
+	default y if BR2_aarch64 || BR2_aarch64_be
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_i386 || BR2_x86_64
+	default y if BR2_m68k
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
+	default y if BR2_nios2
+	default y if BR2_riscv
+	default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb
+	default y if BR2_sparc || BR2_sparc64
 
 menuconfig BR2_PACKAGE_SYSTEMD
 	bool "systemd"