diff --git a/debuginfo-mono.patch b/debuginfo-mono.patch
new file mode 100644
index 0000000..32e1bfd
--- /dev/null
+++ b/debuginfo-mono.patch
@@ -0,0 +1,22 @@
+Index: scripts/find-debuginfo.sh
+===================================================================
+--- scripts/find-debuginfo.sh.orig
++++ scripts/find-debuginfo.sh
+@@ -210,6 +210,17 @@ while read nlinks inum f; do
+ 	;;
+     *) continue ;;
+   esac
++  # double check that we really have an ELF file,
++  # to handle monodevelop-debugger-gdb and monodevelop-debugger-mdb
++  ftype=`/usr/bin/file $f | cut -d: -f2-`
++  case $ftype in
++    *ELF*) ;;
++    *)
++	echo "$f is not an ELF file, skipping"
++	continue
++	;;
++  esac
++
+   get_debugfn "$f"
+   [ -f "${debugfn}" ] && continue
+ 
diff --git a/rpm.changes b/rpm.changes
index a5089c8..501f34a 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 31 18:59:12 UTC 2009 - aj@suse.de
+
+- Fix debuginfo handling for monodevelop-debugger-gdb and
+  monodevelop-debugger-mdb packages (bnc#535543).
+
 -------------------------------------------------------------------
 Wed Aug 26 14:39:44 CEST 2009 - mls@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 44de3e2..c178245 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -95,6 +95,7 @@ Patch59:        disttag-macro.diff
 Patch60:        buildidprov.diff
 Patch61:        debugsubpkg.diff
 Patch62:        debuglink.diff
+Patch63:	debuginfo-mono.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -154,7 +155,7 @@ rm -f rpmdb/db.h
 %patch -P 30 -P 31 -P 32 -P 33 -P 34 -P 35 -P 36 -P 37 -P 38 -P 39
 %patch -P 40 -P 41 -P 42 -P 43 -P 44 -P 45 -P 46 -P 47 -P 48 -P 49
 %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
+%patch -P 60 -P 61 -P 62 -P 63
 #chmod 755 scripts/find-supplements{,.ksyms}
 #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 #chmod 755 scripts/firmware.prov