diff --git a/debian/changelog b/debian/changelog
index 096dff260..c1dcf33a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ linux-2.6 (2.6.31-1~experimental.3) UNRELEASED; urgency=low
   * Include aufs2, marked as staging (Closes: #541828)
   * Include speakup modules under staging
   * Add stable release 2.6.31.5
+  * [x86_64] Enable NUMA_EMU (Closes: #541389)
 
   [ Martin Michlmayr ]
   * CPUidle: always return with interrupts enabled.
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index 53fd933dc..8c503511d 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -15,7 +15,7 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_NUMA=y
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
-# CONFIG_NUMA_EMU is not set
+CONFIG_NUMA_EMU=y
 CONFIG_PCI_MMCONFIG=y
 
 ##