diff --git a/src/cpu/emulation/Makefile.inc b/src/cpu/emulation/Makefile.inc
index ac166afb09..f98d3854be 100644
--- a/src/cpu/emulation/Makefile.inc
+++ b/src/cpu/emulation/Makefile.inc
@@ -1 +1 @@
-subdirs-y += qemu-x86
+subdirs-$(CONFIG_CPU_EMULATION_QEMU_X86) += qemu-x86
diff --git a/src/cpu/emulation/qemu-x86/Makefile.inc b/src/cpu/emulation/qemu-x86/Makefile.inc
index 840af27d35..ea44b26cbe 100644
--- a/src/cpu/emulation/qemu-x86/Makefile.inc
+++ b/src/cpu/emulation/qemu-x86/Makefile.inc
@@ -1 +1 @@
-obj-$(CONFIG_CPU_EMULATION_QEMU_X86) += northbridge.o
+obj-y += northbridge.o