diff --git a/debian/changelog b/debian/changelog
index ac9b9c0b9..2f5e0fcb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ linux-2.6 (2.6.17+2.6.18-rc7-0experimental.1) UNRELEASED; urgency=low
   * [powerpc] Added tentative patch to fix oldworld ramdisk size bug. 
     Thanks fo to Christian Aichinger for investigating and providing the
     patch. (Closes: #366620, #375035).
+  * [powerpc] Fixes hvc_console caused suspsend-to-disk breakage. Thanks to
+    Andrew Morton for providing the patch. (Closes: #387178)
 
   [ Frederik Schüler ]
   * Remove obsolete options from amd64 and i386 configs.
diff --git a/debian/patches/powerpc-hvc_console-suspend-fix.patch b/debian/patches/powerpc-hvc_console-suspend-fix.patch
new file mode 100644
index 000000000..47b523b0c
--- /dev/null
+++ b/debian/patches/powerpc-hvc_console-suspend-fix.patch
@@ -0,0 +1,20 @@
+From: Andrew Morton <akpm@osdl.org>
+
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+---
+
+ drivers/char/hvc_console.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff -puN drivers/char/hvc_console.c~hvc_console-suspend-fix drivers/char/hvc_console.c
+--- a/drivers/char/hvc_console.c~hvc_console-suspend-fix
++++ a/drivers/char/hvc_console.c
+@@ -669,6 +669,7 @@ int khvcd(void *unused)
+ 	do {
+ 		poll_mask = 0;
+ 		hvc_kicked = 0;
++		try_to_freeze();
+ 		wmb();
+ 		if (cpus_empty(cpus_in_xmon)) {
+ 			spin_lock(&hvc_structs_lock);
+_
diff --git a/debian/patches/powerpc-oldworld-boot-fix.diff b/debian/patches/powerpc-oldworld-boot-fix.patch
similarity index 100%
rename from debian/patches/powerpc-oldworld-boot-fix.diff
rename to debian/patches/powerpc-oldworld-boot-fix.patch
diff --git a/debian/patches/series/0experimental.1 b/debian/patches/series/0experimental.1
index e050ab75e..334be9d10 100644
--- a/debian/patches/series/0experimental.1
+++ b/debian/patches/series/0experimental.1
@@ -30,4 +30,5 @@
 + arm-iop-fix-cpuid
 + arm-get_unaligned-gcc41-const.patch
 + powerpc-serial.patch
-+ powerpc-oldworld-boot-fix.diff
++ powerpc-oldworld-boot-fix.patch
++ powerpc-hvc_console-suspend-fix.patch