diff --git a/builds/amd64/Makefile b/builds/amd64/Makefile
index 92917844..435a9dac 100644
--- a/builds/amd64/Makefile
+++ b/builds/amd64/Makefile
@@ -1,2 +1 @@
-DIRECTORIES := rootfs swi installer
-include $(ONL)/make/subdirs.mk
+include $(ONL)/make/arch-build.mk
diff --git a/builds/arm64/Makefile b/builds/arm64/Makefile
index 92917844..435a9dac 100644
--- a/builds/arm64/Makefile
+++ b/builds/arm64/Makefile
@@ -1,2 +1 @@
-DIRECTORIES := rootfs swi installer
-include $(ONL)/make/subdirs.mk
+include $(ONL)/make/arch-build.mk
diff --git a/builds/armel/Makefile b/builds/armel/Makefile
index 92917844..435a9dac 100644
--- a/builds/armel/Makefile
+++ b/builds/armel/Makefile
@@ -1,2 +1 @@
-DIRECTORIES := rootfs swi installer
-include $(ONL)/make/subdirs.mk
+include $(ONL)/make/arch-build.mk
diff --git a/builds/powerpc/Makefile b/builds/powerpc/Makefile
index 92917844..435a9dac 100644
--- a/builds/powerpc/Makefile
+++ b/builds/powerpc/Makefile
@@ -1,2 +1 @@
-DIRECTORIES := rootfs swi installer
-include $(ONL)/make/subdirs.mk
+include $(ONL)/make/arch-build.mk
diff --git a/make/arch-build.mk b/make/arch-build.mk
new file mode 100644
index 00000000..5dc3d5cc
--- /dev/null
+++ b/make/arch-build.mk
@@ -0,0 +1,9 @@
+DIRECTORIES := rootfs swi installer
+include $(ONL)/make/subdirs.mk
+
+.PHONY: swi
+
+swi:
+	$(MAKE) -C rootfs
+	$(MAKE) -C swi
+