diff --git a/debian/changelog b/debian/changelog
index dbd7d9f8e..af6d77ae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ linux-2.6 (3.1.4-2) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * USB: EHCI: fix HUB TT scheduling issue with iso transfer (Closes: #651015)
+  * [x86] Enable MEMTEST (Closes: #613321, #646361)
+    - If bad RAM is detected, WARN and recommend a more thorough test
 
  -- Bastian Blank <waldi@debian.org>  Thu, 01 Dec 2011 13:17:34 +0100
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 7f48e157a..6f75129ef 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -18,7 +18,7 @@ CONFIG_KVM_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_SPINLOCKS is not set
 # CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_MEMTEST is not set
+CONFIG_MEMTEST=y
 CONFIG_HPET_TIMER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
diff --git a/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch b/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch
new file mode 100644
index 000000000..730db42d9
--- /dev/null
+++ b/debian/patches/debian/x86-memtest-WARN-if-bad-RAM-found.patch
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 5 Dec 2011 04:00:58 +0000
+Subject: [PATCH] x86: memtest: WARN if bad RAM found
+
+Since this is not a particularly thorough test, if we find any bad
+bits of RAM then there is a fair chance that there are other bad bits
+we fail to detect.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ arch/x86/mm/memtest.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/x86/mm/memtest.c b/arch/x86/mm/memtest.c
+index 92faf3a..ac6bdaa 100644
+--- a/arch/x86/mm/memtest.c
++++ b/arch/x86/mm/memtest.c
+@@ -30,6 +30,8 @@ static u64 patterns[] __initdata = {
+ 
+ static void __init reserve_bad_mem(u64 pattern, u64 start_bad, u64 end_bad)
+ {
++	WARN_ONCE(1, "Bad RAM detected. Use memtest86+ to perform a thorough test\n"
++		  "and the memmap= parameter to reserve the bad areas.");
+ 	printk(KERN_INFO "  %016llx bad mem addr %010llx - %010llx reserved\n",
+ 	       (unsigned long long) pattern,
+ 	       (unsigned long long) start_bad,
+-- 
+1.7.7.3
+
diff --git a/debian/patches/series/base b/debian/patches/series/base
index 9c3ed61fc..cc7393f56 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -82,3 +82,4 @@
 + features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
 + bugfix/all/USB-EHCI-fix-HUB-TT-scheduling-issue-with-iso-transf.patch
 + bugfix/all/EHCI-Fix-a-regression-in-the-ISO-scheduler.patch
++ debian/x86-memtest-WARN-if-bad-RAM-found.patch