diff --git a/Makefile b/Makefile
index 16f0f2499b..7f32429e07 100644
--- a/Makefile
+++ b/Makefile
@@ -440,6 +440,7 @@ export LBBUILD_IMAGE ?= linuxbios.rom startup_code.rom
 
 
 core-y := mainboard/
+core-y += arch/
 ifeq ($(LBBUILD_COMPRESSORS),)
 core-y		+=  compressors
 
diff --git a/arch/Makefile b/arch/Makefile
new file mode 100644
index 0000000000..6d6eae6c17
--- /dev/null
+++ b/arch/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for LinuxBIOS architectures
+#
+# (c) 2006 coresystems GmbH
+#
+
+obj-$(CONFIG_ARCH_X86)		+= x86/
+obj-$(CONFIG_ARCH_POWERPC)	+= powerpc/
+
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
new file mode 100644
index 0000000000..283ee780bd
--- /dev/null
+++ b/arch/x86/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for LinuxBIOS x86 architecture
+#
+# (c) 2006 coresystems GmbH
+#
+
+obj-y += init/
+
diff --git a/arch/x86/init/Makefile b/arch/x86/init/Makefile
new file mode 100644
index 0000000000..eae9bc63f4
--- /dev/null
+++ b/arch/x86/init/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for LinuxBIOS x86 architecture
+#
+# (c) 2006 coresystems GmbH
+#
+
+obj-y += init.o
+
diff --git a/mainboard/emulation/qemu-i386/Makefile b/mainboard/emulation/qemu-i386/Makefile
index 3bc34c211e..8c9fe38087 100644
--- a/mainboard/emulation/qemu-i386/Makefile
+++ b/mainboard/emulation/qemu-i386/Makefile
@@ -1,11 +1,8 @@
 #
 # Makefile for this mainboard
 #
-# not configurable
-LBARCH=x86
 
 obj-y     = mainboard.o setup_before_car.o
-core-$(UNCOMPRESSORS) += uncompressors
 
 $(obj)/mainboard.o: $(obj)/dtc.h