--- ./scripts/find-debuginfo.sh.orig	2011-05-11 15:59:44.000000000 +0000
+++ ./scripts/find-debuginfo.sh	2011-05-11 16:10:22.000000000 +0000
@@ -186,7 +186,8 @@ make_id_link()
 get_debugfn()
 {
   dn=$(dirname "${1#$RPM_BUILD_ROOT}")
-  bn=$(basename "$1" .debug).debug
+# Do not strip existing .debug suffixes
+  bn=$(basename "$1").debug
 
   debugdn=${debugdir}${dn}
   debugfn=${debugdn}/${bn}