diff --git a/mdb-2.6-build.patch b/mdb-2.6-build.patch
deleted file mode 100644
index ab879a2..0000000
--- a/mdb-2.6-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- mono-debugger-2.6/build/Makefile.am	2009-11-09 12:27:09.000000000 +0000
-+++ mono-debugger-2.6/build/Makefile-new.am	2009-12-22 22:38:13.000000000 +0000
-@@ -1,4 +1,4 @@
--twodir = $(prefix)/lib/mono/2.0
-+twodir = $(libdir)/mono/2.0
- 
- bin_SCRIPTS = mdb mdb-symbolreader
- 
---- mono-debugger-2.6/build/Makefile.in	2009-12-04 20:34:04.000000000 +0000
-+++ mono-debugger-2.6/build/Makefile-new.in	2009-12-22 22:39:42.000000000 +0000
-@@ -226,7 +226,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--twodir = $(prefix)/lib/mono/2.0
-+twodir = @libdir@/mono/2.0
- bin_SCRIPTS = mdb mdb-symbolreader
- two_SCRIPTS = mdb.exe mdb-symbolreader.exe
- MCS_FLAGS = -debug -define:DEBUG -define:DEBUGGER_SOURCE \
diff --git a/mdb-2.6-configure.patch b/mdb-2.6-configure.patch
deleted file mode 100644
index 5da4f52..0000000
--- a/mdb-2.6-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mono-debugger-2.6/configure.in	2009-09-25 16:19:09.000000000 +0100
-+++ mono-debugger-2.6/configure-new.in	2009-12-22 22:26:52.000000000 +0000
-@@ -164,7 +164,7 @@
- AC_SUBST(WRAPPER_CFLAGS)
- AC_SUBST(WRAPPER_LIBS)
- 
--GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib'
-+GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir) /root $(DESTDIR)$(libdir)'
- AC_PATH_PROG(GACUTIL, gacutil, no)
- if test "x$GACUTIL" = "xno" ; then
-    AC_MSG_ERROR([No gacutil tool found])
diff --git a/mdb-2.6-doc.patch b/mdb-2.6-doc.patch
deleted file mode 100644
index 0f936a6..0000000
--- a/mdb-2.6-doc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- mono-debugger-2.6/doc/Makefile.am	2009-09-25 16:19:09.000000000 +0100
-+++ mono-debugger-2.6/doc/Makefile-new.am	2009-12-22 22:43:19.000000000 +0000
-@@ -1,15 +1,15 @@
- EXTRA_DIST = FAQ.txt \
- 	     symbol-lookups.txt debugger.source
- 
--sourcesdir = @mono_prefix@/lib/monodoc/sources
-+sourcesdir = @libdir@/monodoc/sources
- 
- sources_DATA = debugger.tree debugger.zip debugger.source
- 
- debugger.tree debugger.zip: $(srcdir)/api/*/*.xml
--	mono --debug @monodoc_prefix@/lib/monodoc/assembler.exe --ecma $(srcdir)/api -o debugger
-+	mono --debug @libdir@/monodoc/assembler.exe --ecma $(srcdir)/api -o debugger
- 
- update:
--	monodocer -assembly:@prefix@/lib/mono/mono-debugger/Mono.Debugger.dll -path:./api -delete -includenonpublic
-+	monodocer -assembly:@libdir@/mono/mono-debugger/Mono.Debugger.dll -path:./api -delete -includenonpublic
- 
- dist-hook:
- 	find . -name '*.xml' > files
---- mono-debugger-2.6/doc/Makefile.in	2009-12-04 20:34:04.000000000 +0000
-+++ mono-debugger-2.6/doc/Makefile-new.in	2009-12-22 22:44:26.000000000 +0000
-@@ -209,7 +209,7 @@
- EXTRA_DIST = FAQ.txt \
- 	     symbol-lookups.txt debugger.source
- 
--sourcesdir = @mono_prefix@/lib/monodoc/sources
-+sourcesdir = @libdir@/monodoc/sources
- sources_DATA = debugger.tree debugger.zip debugger.source
- CLEANFILES = debugger.tree debugger.zip files
- all: all-am
diff --git a/mono-debugger.spec b/mono-debugger.spec
index 8b4f8cf..a53be47 100644
--- a/mono-debugger.spec
+++ b/mono-debugger.spec
@@ -1,16 +1,13 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 URL:     http://www.mono-project.com/Main_Page
 Source0: http://ftp.novell.com/pub/mono/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0:  mdb-2.6-configure.patch
-Patch1:  mdb-2.6-build.patch
-Patch2:  mdb-2.6-doc.patch
 BuildRequires: readline-devel ncurses-devel libtool
 BuildRequires: mono-devel >= 2.8.1 mono-nunit
-BuildRequires: mono-nunit-devel autoconf automake xsp-devel 
+BuildRequires: mono-nunit-devel xsp-devel 
 Requires: mono-core >= 2.8.1
 Group: Development/Tools
 # Mono only available on these:
@@ -37,18 +34,10 @@ Development package for mono-debugger
 %prep
 %setup -q
 rm -rf build/*.dll
-%patch0 -p1 -b .config
-%patch1 -p1 -b .build
-%patch2 -p1 -b .doc
-
-sed -i -e 's!/usr/lib!%{_libdir}!g' mono-debugger-frontend.pc.in
-sed -i -e 's!${prefix}/lib/!%{_libdir}/!g' mono-debugger-frontend.pc.in
-sed -i -e 's!${prefix}/lib/!%{_libdir}/!g' mono-debugger.pc.in
 
 # Copy something that we know got built from source.
 # This doesn't end up in the package, though.
-cp %{_libdir}/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/
-autoreconf -f -i -s
+cp %{_prefix}/lib/mono/gac/Mono.Cecil/*/Mono.Cecil.dll build/
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -69,11 +58,11 @@ find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 %{_bindir}/mdb
 %{_bindir}/mdb-symbol*
 %{_libdir}/*.so*
-%{_libdir}/mono/2.0/mdb*
-%{_libdir}/mono/gac/Mono.Debugger/
-%{_libdir}/mono/gac/Mono.Debugger.SymbolWriter/
-%{_libdir}/mono/gac/Mono.Debugger.Frontend/
-%{_libdir}/mono/mono-debugger/
+%{_prefix}/lib/mono/2.0/mdb*
+%{_prefix}/lib/mono/gac/Mono.Debugger/
+%{_prefix}/lib/mono/gac/Mono.Debugger.SymbolWriter/
+%{_prefix}/lib/mono/gac/Mono.Debugger.Frontend/
+%{_prefix}/lib/mono/mono-debugger/
 
 %files devel
 %defattr(-,root,root,-)
@@ -81,6 +70,10 @@ find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 %{_libdir}/pkgconfig/mono-debugger-frontend.pc
 
 %changelog
+* Sat Nov 12 2011 Christian Krause <chkr@fedoraproject.org> - 2.10-2
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Wed Mar 30 2011 Christian Krause <chkr@fedoraproject.org> - 2.10-1
 - Update to 2.10
 - Minor spec file cleanup