diff --git a/debugedit-stabs-warning.diff b/debugedit-stabs-warning.diff
new file mode 100644
index 0000000..24fea63
--- /dev/null
+++ b/debugedit-stabs-warning.diff
@@ -0,0 +1,11 @@
+--- tools/debugedit.c.stabs	2011-07-29 14:32:45.000000000 +0200
++++ tools/debugedit.c	2011-07-29 14:32:50.000000000 +0200
+@@ -1657,7 +1657,7 @@
+ 	  if (strcmp (name, ".stab") == 0)
+ 	    {
+ 	      fprintf (stderr, "Stabs debuginfo not supported: %s\n", file);
+-	      exit (1);
++	      break;
+ 	    }
+ 	  if (strcmp (name, ".debug_info") == 0)
+ 	    edit_dwarf2 (dso);
diff --git a/rpm.changes b/rpm.changes
index 9ca12a2..a9eb82c 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 24 12:40:05 UTC 2011 - meissner@novell.com
+
+- restore old debugedit behaviour for stabs, otherwise
+  binaries with stabs in it will fail the build (e.g. vmlinux images
+  on Power)
+
 -------------------------------------------------------------------
 Mon Aug 15 01:04:17 CEST 2011 - ro@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index af4b8fb..44f1199 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -114,6 +114,7 @@ Patch76:        buildpipe.diff
 Patch77:        trailslash.diff
 Patch78:        docdefattr.diff
 Patch79:        mono-find-requires.diff
+Patch80:        debugedit-stabs-warning.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -177,6 +178,7 @@ rm -f rpmdb/db.h
 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
+%patch -P 80
 #chmod 755 scripts/find-supplements{,.ksyms}
 #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 #chmod 755 scripts/firmware.prov