diff --git a/mainboard/emulation/qemu-x86/Makefile b/mainboard/emulation/qemu-x86/Makefile
index 0c1b732ec6..5489660b06 100644
--- a/mainboard/emulation/qemu-x86/Makefile
+++ b/mainboard/emulation/qemu-x86/Makefile
@@ -52,11 +52,15 @@ $(obj)/linuxbios.initram: $(obj)/stage0.init $(obj)/stage0.o $(obj)/mainboard/$(
 
 $(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.o
 
-$(obj)/mainboard/$(MAINBOARDDIR)/statictree.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.c
+$(obj)/mainboard/$(MAINBOARDDIR)/statictree.o: $(obj)/mainboard/$(MAINBOARDDIR)/statictree.c $(obj)/statictree.h
 	$(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(CC) $(CFLAGS) $(LINUXBIOSINCLUDE) -c -o $@ $<
+	$(Q)$(CC) $(INITCFLAGS) $(LINUXBIOSINCLUDE) -c -o $@ $<
 
-$(obj)/mainboard/$(MAINBOARDDIR)/statictree.c: $(src)/mainboard/$(MAINBOARDDIR)/dts $(obj)/util/dtc/dtc
+$(obj)/statictree.h: $(src)/mainboard/$(MAINBOARDDIR)/dts $(obj)/util/dtc/dtc
+	$(Q)printf "  DTC (static.h)     $(subst $(shell pwd)/,,$(@))\n"
+	$(Q)$(obj)/util/dtc/dtc -O lbh mainboard/$(MAINBOARDDIR)/dts > $@
+
+$(obj)/mainboard/$(MAINBOARDDIR)/statictree.c: $(src)/mainboard/$(MAINBOARDDIR)/dts $(obj)/util/dtc/dtc $(obj)/statictree.h
 	$(Q)printf "  DTC     $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(obj)/util/dtc/dtc -O lb mainboard/$(MAINBOARDDIR)/dts > $@
 
diff --git a/mainboard/emulation/qemu-x86/dts b/mainboard/emulation/qemu-x86/dts
index a377cd098d..96840891b6 100644
--- a/mainboard/emulation/qemu-x86/dts
+++ b/mainboard/emulation/qemu-x86/dts
@@ -18,43 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 /{
-	config = "mainboard,emulation,qemu-x86";
 	enabled;
-
+	constructor = "qemuvga_constructors";
 	cpus {
 		enabled;
 	};
 	domain0 {
-		enabled;
-		config = "northbridge,intel,i440bxemulation";
+		/config/("northbridge/intel/i440bxemulation");
 		ops = "i440bxemulation_pcidomainops";
+		enabled;
 		pcidomain = "0";
 		device0,0 {
 			enabled;
 			pcipath = "0,0";
 		};
-/*		southbridge,intel,piix4{
-			pcipath = "0,0";
+		southbridge,intel,piix4{
+			/config/("southbridge/intel/i82371eb");
+			pcipath = "1,0";
 			enabled;
 		};
-*/
 	};
 
 };
-
-%%
-
-#include <southbridge/intel/i82371eb/config.h>
-extern struct constructor qemuvga_constructors[];
-
-struct mainboard_emulation_qemu_x86_config root = {
-	.nothing = 1,
-};
-
-struct northbridge_intel_i440bx_config domain0 = {
-	.ramsize = CONFIG_NORTHBRIDGE_INTEL_I440BXEMULATION_RAMSIZE,
-};
-
-struct constructor *all_constructors[] = {
-	i440bx_constructors, i82371eb_constructors, qemuvga_constructors, 0
-};