diff --git a/debugsubpkg.diff b/debugsubpkg.diff
index 4a57d05..4d6a50c 100644
--- a/debugsubpkg.diff
+++ b/debugsubpkg.diff
@@ -1,7 +1,9 @@
 Create a debuginfo package for each subpackage.
 
---- ./build/files.c.orig	2012-06-01 13:13:45.000000000 +0000
-+++ ./build/files.c	2012-06-01 13:14:18.000000000 +0000
+Index: build/files.c
+===================================================================
+--- build/files.c.orig
++++ build/files.c
 @@ -21,6 +21,10 @@
  #include <rpm/rpmlog.h>
  #include <rpm/rpmbase64.h>
@@ -266,8 +268,10 @@ Create a debuginfo package for each subpackage.
  	    goto exit;
  
  	a = headerGetString(pkg->header, RPMTAG_ARCH);
---- ./macros.in.orig	2012-06-01 13:13:45.000000000 +0000
-+++ ./macros.in	2012-06-01 13:14:18.000000000 +0000
+Index: macros.in
+===================================================================
+--- macros.in.orig
++++ macros.in
 @@ -182,24 +182,10 @@
  #	Template for debug information sub-package.
  %debug_package \
@@ -293,9 +297,23 @@ Create a debuginfo package for each subpackage.
  %description debugsource\
  This package provides debug sources for package %{name}.\
  Debug sources are useful when developing applications that use this\
---- ./scripts/find-debuginfo.sh.orig	2012-06-01 13:13:45.000000000 +0000
-+++ ./scripts/find-debuginfo.sh	2012-06-01 13:15:56.000000000 +0000
-@@ -311,19 +311,11 @@ while read nlinks inum f; do
+Index: scripts/find-debuginfo.sh
+===================================================================
+--- scripts/find-debuginfo.sh.orig
++++ scripts/find-debuginfo.sh
+@@ -149,6 +149,11 @@ debug_link()
+ # Provide .2, .3, ... symlinks to all filename instances of this build-id.
+ make_id_dup_link()
+ {
++  # See https://bugzilla.redhat.com/show_bug.cgi?id=641377 for the reasoning, 
++  # but it has seveal drawbacks as we would need to split the .1 suffixes into 
++  # different subpackages and it's about impossible to predict the number
++  # -> perhaps later
++  return
+   local id="$1" file="$2" idfile
+ 
+   local n=1
+@@ -311,19 +316,11 @@ while read nlinks inum f; do
    fi
  done || exit
  
diff --git a/rpm.changes b/rpm.changes
index 6a27102..26b07b0 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 17 10:12:03 UTC 2012 - coolo@suse.com
+
+- disarm the additional links for debuginfos as they break our
+  "debuginfo per subpackage" functionality.
+
 -------------------------------------------------------------------
 Thu Sep 13 14:05:57 UTC 2012 - coolo@suse.com