diff --git a/config-x86-generic b/config-x86-generic
index 9ba3354cd..eb786908e 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -66,6 +66,7 @@ CONFIG_CAPI_EICON=y
 #
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_DEBUG_RODATA=y
diff --git a/kernel.spec b/kernel.spec
index 4ccceecde..cdb59d4cc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2024,6 +2024,9 @@ fi
 #
 # 
 %changelog
+* Tue Aug 04 2015 Hans de Goede <hdegoede@redhat.com>
+- Always enable mmiotrace when building x86 kernels
+
 * Tue Aug 04 2015 Hans de Goede <hdegoede@redhat.com>
 - Move joydev.ko from kernel-modules-extra to kernel-modules