diff --git a/mono-1.2.3-use-monodir.patch b/mono-1.2.3-use-monodir.patch
deleted file mode 100644
index 1d286bd..0000000
--- a/mono-1.2.3-use-monodir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mono-1.2.3/scripts/script.in	2006-08-25 20:35:14.000000000 +0100
-+++ mono-1.2.3/scripts/script-new.in	2007-01-27 23:42:39.000000000 +0000
-@@ -1,2 +1,2 @@
- #!/bin/sh
--exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe "$@"
-+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@"
-
---- mono-1.2.3/scripts/script_umask.in	2006-08-25 20:35:14.000000000 +0100
-+++ mono-1.2.3/scripts/script_umask-new.in	2007-01-27 23:45:58.000000000 +0000
-@@ -1,3 +1,3 @@
- #!/bin/sh
- umask 077
--exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe "$@"
-+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@"
diff --git a/mono-2.0-monoservice.patch b/mono-2.0-monoservice.patch
deleted file mode 100644
index b58ced2..0000000
--- a/mono-2.0-monoservice.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mono-2.0/scripts/mono-service.in	2008-08-03 08:12:55.000000000 +0100
-+++ mono-2.0/scripts/mono-service-new.in	2008-08-03 08:17:46.000000000 +0100
-@@ -35,7 +35,7 @@
- 
- export MONO_DISABLE_SHM=1
- if $debug; then
--   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args
-+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/mono-service.exe $args
- else
--   exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/mono-service.exe $args </dev/null >/dev/null 2>&1 &
-+   exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe $args </dev/null > /dev/null 2>&1 &
- fi
diff --git a/mono-2.10-libdir.patch b/mono-2.10-libdir.patch
deleted file mode 100644
index 0c35283..0000000
--- a/mono-2.10-libdir.patch
+++ /dev/null
@@ -1,247 +0,0 @@
---- mono-2.8/mcs/tools/gacutil/driver.cs	2010-09-10 21:55:45.000000000 +0100
-+++ mono-2.8/mcs/tools/gacutil/driver-new.cs	2010-09-15 13:32:30.335396575 +0100
-@@ -808,8 +808,8 @@
- 		private static string EnsureLib (string dir)
- 		{
- 			DirectoryInfo d = new DirectoryInfo (dir);
--			if (d.Name == "lib")
-+			if (d.Name == "lib" || d.Name == "lib64")
- 				return dir;
- 			return Path.Combine (dir, "lib");
- 		}
- 
---- mono-2.6.4/data/mint.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/mint.pc-new.in	2010-04-27 00:34:27.000000000 +0100
-@@ -1,6 +1,6 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${pcfiledir}/../..
--libdir=${prefix}/lib
-+libdir=@LIBDIR@
- includedir=${prefix}/include/mono-@API_VER@
- 
- 
---- mono-2.6.4/data/mono.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/mono.pc-new.in	2010-04-27 00:34:57.000000000 +0100
-@@ -1,6 +1,6 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${pcfiledir}/../..
--libdir=${prefix}/@reloc_libdir@
-+libdir=@LIBDIR@
- includedir=${prefix}/include/mono-@API_VER@
- sysconfdir=@sysconfdir@
- 
---- mono-2.6.4/data/mono.web.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/mono.web.pc-new.in	2010-04-27 00:40:27.000000000 +0100
-@@ -1,4 +1,4 @@
- Name: Mono.Web
- Description: Mono ASP.NET extension classes
- Version: 2.0.0.0
--Libs: -r:@prefix@/lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
-+Libs: -r:@LIBDIR@/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
-
---- mono-2.6.4/data/mono-lineeditor.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/mono-lineeditor.pc-new.in	2010-04-27 00:37:17.000000000 +0100
-@@ -1,5 +1,5 @@
- prefix=${pcfiledir}/../..
--assemblies_dir=${prefix}/lib/mono-source-libs
-+assemblies_dir=@LIBDIR@/mono-source-libs
- Sources=${assemblies_dir}/getline.cs
- 
- Name: Mono.Terminal.LineEditor
---- mono-2.6.4/data/mono-nunit.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/mono-nunit.pc-new.in	2010-04-27 00:37:48.000000000 +0100
-@@ -1,6 +1,6 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@LIBDIR@
- 
- 
- Name: Mono NUnit
---- mono-2.6.4/data/mono-options.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/mono-options.pc-new.in	2010-04-27 00:38:21.000000000 +0100
-@@ -1,5 +1,5 @@
- prefix=${pcfiledir}/../..
--assemblies_dir=${prefix}/lib/mono-source-libs
-+assemblies_dir=@LIBDIR@/mono-source-libs
- Sources=${assemblies_dir}/Options.cs
- 
- Name: Mono.Options
---- mono-2.6.4/data/system.web.extensions.design_1.0.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/system.web.extensions.design_1.0.pc-new.in	2010-04-27 00:38:43.000000000 +0100
-@@ -1,4 +1,4 @@
- Name: System.Web.Extensions.Design
- Description: System.Web.Extensions.Design ASP.NET 2.0 add-on
- Version: 1.0.61025.0
--Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
-+Libs: -r:@LIBDIR@/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
---- mono-2.6.4/data/system.web.extensions_1.0.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/system.web.extensions_1.0.pc-new.in	2010-04-27 00:39:00.000000000 +0100
-@@ -1,4 +1,4 @@
- Name: System.Web.Extensions
- Description: System.Web.Extensions ASP.NET 2.0 add-on
- Version: 1.0.61025.0
--Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
-+Libs: -r:@LIBDIR@/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
---- mono-2.6.4/data/system.web.mvc.pc.in	2010-04-22 16:37:47.000000000 +0100
-+++ mono-2.6.4/data/system.web.mvc.pc-new.in	2010-04-27 00:39:16.000000000 +0100
-@@ -1,4 +1,4 @@
- Name: System.Web.Mvc
- Description: System.Web.Mvc - ASP.NET MVC
- Version: 1.0.0.0
--Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
-+Libs: -r:@LIBDIR@/mono/gac/System.Web.Mvc/1.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
-
---- mono-2.8/configure.in	2010-09-10 21:55:45.000000000 +0100
-+++ mono-2.8/configure-new.in	2010-09-15 14:01:05.640710876 +0100
-@@ -2886,7 +2886,7 @@
-     echo "prefix=$prefix" > $mcs_topdir/build/config.make
-     echo "exec_prefix=$exec_prefix" >> $mcs_topdir/build/config.make
-     echo "sysconfdir=$sysconfdir" >> $mcs_topdir/build/config.make
--    echo 'mono_libdir=${exec_prefix}/lib' >> $mcs_topdir/build/config.make
-+    echo 'mono_libdir=@LIBDIR@' >> $mcs_topdir/build/config.make
-     echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $mcs_topdir/build/config.make
-     echo 'IL_FLAGS = /debug' >> $mcs_topdir/build/config.make
-     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $mcs_topdir/build/config.make
-@@ -2937,7 +2937,7 @@
- 
-       echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
-       echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
--      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
-+      echo 'mono_libdir=@LIBDIR@' >> $srcdir/$olivedir/build/config.make
-       echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
-       echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
-       echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
---- mono-2.8/data/monodoc.pc.in	2010-09-10 21:55:45.000000000 +0100
-+++ mono-2.8/data/monodoc.pc-new.in	2010-09-22 12:43:38.220677135 +0100
-@@ -1,9 +1,9 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@prefix@/lib
-+libdir=@LIBDIR@
- sourcesdir=${libdir}/monodoc/sources
- 
- Name: Monodoc
- Description: Monodoc - Mono Documentation Tools
- Version: @VERSION@
--Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll 
-+Libs: /r:${libdir}/mono/monodoc/monodoc.dll 
---- mono-2.8/data/mono-cairo.pc.in	2010-09-10 21:55:45.000000000 +0100
-+++ mono-2.8/data/mono-cairo.pc-new.in	2010-09-22 12:42:53.873541601 +0100
-@@ -1,9 +1,9 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${pcfiledir}/../..
--libdir=${prefix}/@reloc_libdir@
-+libdir=@LIBDIR@
- includedir=${prefix}/include
- 
- Name: Mono.Cairo
- Description: Cairo bindings for Mono
- Version: @VERSION@
--Libs: -r:${prefix}/lib/mono/2.0/Mono.Cairo.dll
-+Libs: -r:${libdir}/mono/2.0/Mono.Cairo.dll
---- mono-2.8/data/system.web.mvc2.pc.in	2010-09-10 21:55:45.000000000 +0100
-+++ mono-2.8/data/system.web.mvc2.pc-new.in	2010-09-22 12:44:16.452759229 +0100
-@@ -1,4 +1,4 @@
- Name: System.Web.Mvc2
- Description: System.Web.Mvc - ASP.NET MVC v2
- Version: 2.0.0.0
--Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
-+Libs: -r:@LIBDIR@/mono/gac/System.Web.Mvc/2.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
---- mono-2.8/docs/Makefile.in	2010-09-10 21:58:21.000000000 +0100
-+++ mono-2.8/docs/Makefile-new.in	2010-09-22 12:51:28.223926963 +0100
-@@ -252,7 +252,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--sourcesdir = $(prefix)/lib/monodoc/sources
-+sourcesdir = @LIBDIR@/monodoc/sources
- sources_DATA = \
- 	mono-file-formats.source \
- 	mono-tools.source \
---- mono-2.8/docs/Makefile.am	2010-09-10 21:55:45.000000000 +0100
-+++ mono-2.8/docs/Makefile-new.am	2010-09-22 12:49:54.369453974 +0100
-@@ -1,4 +1,4 @@
--sourcesdir = $(prefix)/lib/monodoc/sources
-+sourcesdir = @LIBDIR@/monodoc/sources
- 
- sources_DATA = \
- 	mono-file-formats.source \
---- mono-2.8/data/mono-2.pc.in	2010-09-10 21:55:45.000000000 +0100
-+++ mono-2.8/data/mono-2.pc-new.in	2010-09-22 12:54:54.445011590 +0100
-@@ -1,6 +1,6 @@
- prefix=${pcfiledir}/../..
- exec_prefix=${pcfiledir}/../..
--libdir=${prefix}/@reloc_libdir@
-+libdir=@LIBDIR@
- includedir=${prefix}/include/mono-@API_VER@
- sysconfdir=@sysconfdir@
- 
---- mono-2.10/mono/metadata/assembly.c	2011-01-31 20:16:05.000000000 +0000
-+++ mono-2.10/mono/metadata/assembly-new.c	2011-02-03 19:04:44.865273789 +0000
-@@ -578,7 +578,7 @@
- 	}
- 
- 	config = g_build_filename (base, "etc", NULL);
--	lib = g_build_filename (base, "lib", NULL);
-+	lib = g_build_filename (base, MONO_RELOC_LIBDIR, NULL);
- 	mono = g_build_filename (lib, "mono/2.0", NULL);
- 	if (stat (mono, &buf) == -1)
- 		fallback ();
-@@ -2136,7 +2136,7 @@
- 	if (extra_gac_paths) {
- 		paths = extra_gac_paths;
- 		while (!res && *paths) {
--			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
-+			gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", aname->name, NULL);
- 			res = probe_for_partial_name (gacpath, fullname, aname, status);
- 			g_free (gacpath);
- 			paths++;
-@@ -2266,7 +2266,7 @@
- 		paths = extra_gac_paths;
- 		while (!image && *paths) {
- 			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
--					"lib", "mono", "gac", subpath, NULL);
-+					MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
- 			image = mono_image_open (fullpath, NULL);
- 			g_free (fullpath);
- 			paths++;
-@@ -2572,7 +2572,7 @@
- 	if (extra_gac_paths) {
- 		paths = extra_gac_paths;
- 		while (!result && *paths) {
--			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
-+			fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
- 			result = mono_assembly_open_full (fullpath, status, refonly);
- 			g_free (fullpath);
- 			paths++;
---- mono-2.10/data/cecil.pc.in	2011-01-31 20:16:05.000000000 +0000
-+++ mono-2.10/data/cecil.pc-new.in	2011-02-03 19:10:50.904123791 +0000
-@@ -1,4 +1,4 @@
--assemblies_dir=@prefix@/lib/mono
-+assemblies_dir=@LIBDIR@/mono
- Libraries=${assemblies_dir}/gac/Mono.Cecil/0.9.4.0__0738eb9f132ed756/Mono.Cecil.dll
- 
- Name: Mono Internal -- Do not use.
---- mono-2.10/scripts/Makefile.am	2011-01-31 20:16:05.000000000 +0000
-+++ mono-2.10/scripts/Makefile-new.am	2011-02-03 19:14:37.488167039 +0000
-@@ -171,7 +171,7 @@
- endif
- else
- plat_bindir = $(bindir)
--mono_instdir = $(prefix)/lib/mono
-+mono_instdir = @LIBDIR@/mono
- endif
- 
- 
---- mono-2.10/mcs/build/config-default.make	2011-01-31 20:16:05.000000000 +0000
-+++ mono-2.10/mcs/build/config-default-new.make	2011-02-03 20:01:19.554349792 +0000
-@@ -19,7 +19,7 @@
- endif
- prefix = /usr/local
- exec_prefix = $(prefix)
--mono_libdir = $(exec_prefix)/lib
-+mono_libdir = @LIBDIR@
- sysconfdir = $(prefix)/etc
- #RUNTIME = mono
- RUNTIME = false
diff --git a/mono-2.10-metadata-makefile.patch b/mono-2.10-metadata-makefile.patch
deleted file mode 100644
index 313181e..0000000
--- a/mono-2.10-metadata-makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- mono-2.10/mono/metadata/Makefile.am	2011-01-31 20:16:05.000000000 +0000
-+++ mono-2.10/mono/metadata/Makefile-new.am	2011-02-03 20:09:49.629265658 +0000
-@@ -20,7 +20,7 @@
- AM_CFLAGS = -O
- else
- 
--assembliesdir = $(exec_prefix)/lib
-+assembliesdir = @LIBDIR@
- confdir = $(sysconfdir)
- unix_sources = \
- 	console-unix.c
-@@ -56,7 +56,7 @@
- endif
- noinst_LTLIBRARIES =  $(shared_libraries) libmonoruntime-static.la $(sgen_libraries) $(moonlight_libraries)
- 
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
- 
- #
- # Make sure any prefix changes are updated in the binaries too.
---- mono-2.10/mono/metadata/Makefile.in	2011-01-31 20:32:29.000000000 +0000
-+++ mono-2.10/mono/metadata/Makefile-new.in	2011-02-03 20:10:45.176821202 +0000
-@@ -848,7 +848,7 @@
- # The files that use MONO_ASSEMBLIES and/or MONO_CFG_DIR replace the
- # / by \ if running under WIN32.
- @CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@assembliesdir = ${libdir}
--@HOST_WIN32_FALSE@assembliesdir = $(exec_prefix)/lib
-+@HOST_WIN32_FALSE@assembliesdir = @LIBDIR@
- @CROSS_COMPILING_FALSE@@HOST_WIN32_TRUE@confdir = `cygpath -m "${sysconfdir}"`
- @CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@confdir = ${sysconfdir}
- @HOST_WIN32_FALSE@confdir = $(sysconfdir)
-@@ -868,7 +868,7 @@
- @MOONLIGHT_TRUE@moonlight_libraries = libmonoruntimemoon.la
- @SHARED_MONO_TRUE@shared_libraries = libmonoruntime.la
- noinst_LTLIBRARIES = $(shared_libraries) libmonoruntime-static.la $(sgen_libraries) $(moonlight_libraries)
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
- CLEANFILES = mono-bundle.stamp
- libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD)
- null_sources = \
diff --git a/mono-2.2-uselibdir.patch b/mono-2.2-uselibdir.patch
deleted file mode 100644
index d067161..0000000
--- a/mono-2.2-uselibdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs	2008-08-03 07:58:47.000000000 +0100
-+++ mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper-new.cs	2008-08-03 08:06:47.000000000 +0100
-@@ -53,10 +53,10 @@
- 			//xbuildDir = Path.Combine (t2.FullName, "xbuild");
- 			// /usr/local/lib
- 			t3 = t2.Parent;
-+			libDir = t3.FullName;
- 			// /usr/local
- 			t4 = t3.Parent;
- 			binDir = Path.Combine (t4.FullName, "bin");
--			libDir = Path.Combine (t4.FullName, "lib");
- 		}
- 	
- 		internal static string GetBinDir ()
-
diff --git a/mono.spec b/mono.spec
index 969e4f2..15279cf 100644
--- a/mono.spec
+++ b/mono.spec
@@ -1,13 +1,12 @@
 Name:           mono
 Version:        2.10.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.mono-project.com/Main_Page
 Source0:        http://origin-download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
-Source1:        monodir.c
 # This key was generated by Tom "spot" Callaway <tcallawa@redhat.com> on Dec 1, 2009
 # by running the following command:
 # sn -k mono.snk
@@ -25,8 +24,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  libunwind
 BuildRequires:  libunwind-devel
 %endif
-# Required for mono-libdir.patch
-BuildRequires: automake libtool gettext-devel
+BuildRequires: gettext-devel
 
 # Yes, mono actually depends on itself, because
 # we deleted the bootstrapping binaries. If you
@@ -39,11 +37,6 @@ BuildRequires: mono-core
 ExclusiveArch: %ix86 x86_64 ia64 %{arm} sparcv9 alpha s390x ppc ppc64
 
 Patch0: mono-2.8-ppc-thread.patch
-Patch1: mono-2.10-libdir.patch
-Patch2: mono-1.2.3-use-monodir.patch
-Patch3: mono-2.2-uselibdir.patch
-Patch4: mono-2.0-monoservice.patch
-Patch5: mono-2.10-metadata-makefile.patch
 Patch6: mono-281-libgdiplusconfig.patch
 Patch7: mono-2.10-monodis.patch
 
@@ -253,7 +246,7 @@ Development file for monodoc
 
 %endif
 
-%define monodir %{_libdir}/mono
+%define monodir /usr/lib/mono
 %define gac_dll(dll)  %{monodir}/gac/%{1} \
   %{monodir}/?.?/%{1}.dll \
   %{nil}
@@ -266,18 +259,8 @@ Development file for monodoc
 %setup -q
 
 %patch0 -p1 -b .ppc-threading
-sed -i -e 's!@LIBDIR@!%{_libdir}!' %{PATCH1}
-sed -i -e 's!@LIBDIR@!%{_libdir}!' %{PATCH5}
-%patch1 -p1 -b .libdir
-%patch5 -F 2 -p1 -b .metadata-makefile
-sed -i -e 's!%{_libdir}!@LIBDIR@!' %{PATCH1}
-sed -i -e 's!%{_libdir}!@LIBDIR@!' %{PATCH5}
-%patch2 -p1 -b .usemonodir
-%patch3 -p1 -b .uselibdir
-%patch4 -p1 -b .monoservice
 %patch6 -F 1 -p1 -b .libgdiplus
 %patch7 -p1 -b .monodis
-autoreconf -f -i -s
 
 # Add undeclared Arg
 sed -i "61a #define ARG_MAX     _POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
@@ -292,8 +275,6 @@ export CFLAGS="-O2 -fno-strict-aliasing"
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %endif
 
-gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
-
 %configure --with-ikvm-native=yes --with-jit=yes --with-xen_opt=yes \
            --with-moonlight=no --with-profile2=yes --with-monotouch=no \
            --with-libgdiplus=installed --with-sgen=no \
@@ -305,9 +286,7 @@ gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 make 
 
 %install
-%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot}  install 
-install monodir %{buildroot}%{_bindir}
 
 # copy the mono.snk key into /etc/pki/mono
 mkdir -p %{buildroot}%{_sysconfdir}/pki/mono
@@ -328,12 +307,12 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/barrett_diagram
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/*.html
 %{__rm} %{buildroot}%{_datadir}/libgc-mono/gc.man
-%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/mscorlib.dll.so
-%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/mcs.exe.so
-%{__rm} -f %{buildroot}%{_libdir}/mono/2.0/gmcs.exe.so
+%{__rm} -f %{buildroot}%{monodir}/2.0/mscorlib.dll.so
+%{__rm} -f %{buildroot}%{monodir}/2.0/mcs.exe.so
+%{__rm} -f %{buildroot}%{monodir}/2.0/gmcs.exe.so
 %{__rm} -rf %{buildroot}%{monodir}/xbuild/Microsoft
-%{__rm} -f %{buildroot}%{_libdir}/mono/4.0/mscorlib.dll.so
-%{__rm} -f %{buildroot}%{_libdir}/mono/4.0/dmcs.exe.so
+%{__rm} -f %{buildroot}%{monodir}/4.0/mscorlib.dll.so
+%{__rm} -f %{buildroot}%{monodir}/4.0/dmcs.exe.so
 %{__rm} -rf %{buildroot}%{monodir}/4.0/Mono.Security.Win32
 %{__rm} -rf %{buildroot}%{_bindir}/mono-configuration-crypto
 %{__rm} -rf %{buildroot}%{_mandir}/man?/mono-configuration-crypto*
@@ -348,14 +327,10 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 
 %postun devel -p /sbin/ldconfig
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files core -f mcs.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB ChangeLog NEWS README
 %{_bindir}/mono
-%{_bindir}/monodir
 %{_bindir}/mono-test-install
 %{_bindir}/mono-gdb.py
 %mono_bin csharp
@@ -426,7 +401,6 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %config (noreplace) %{_sysconfdir}/mono/config
 %config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
 %config (noreplace) %{_sysconfdir}/mono/2.0/settings.map
-%{_libdir}/mono-source-libs/
 %{_libdir}/libmono*-2.0.so.*
 %{_libdir}/libmono-profiler-*.so.*
 %config (noreplace) %{_sysconfdir}/mono/4.0/*.config
@@ -500,6 +474,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %mono_bin sgen
 %mono_bin secutil
 %mono_bin signcode
+%{_prefix}/lib/mono-source-libs/
 %{_bindir}/pedump
 %{_mandir}/man1/resgen.1.gz
 %{_mandir}/man1/al.1.gz
@@ -568,7 +543,7 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %{_includedir}/mono-2.0/mono/utils/*.h
 %{_includedir}/mono-2.0/mono/cil/opcode.def
 %{_libdir}/libmono*-2.0.so
-%{_libdir}/mono/xbuild-frameworks
+%{monodir}/xbuild-frameworks
 
 %files nunit
 %defattr(-,root,root,-)
@@ -720,8 +695,8 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 %files -n monodoc
 %defattr(-, root, root)
 %{monodir}/gac/monodoc
-%{_libdir}/monodoc/*
-%{monodir}/monodoc/monodoc.dll
+%{monodir}/monodoc/*
+%{_prefix}/lib/monodoc
 %mono_bin mdoc
 %{_bindir}/mod
 %{_bindir}/mdoc-*
@@ -739,6 +714,10 @@ install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/mono/
 
 
 %changelog
+* Sun Oct 23 2011 Christian Krause <chkr@fedoraproject.org> - 2.10.6-2
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Sat Oct 15 2011 Christian Krause <chkr@fedoraproject.org> - 2.10.6-1
 - Update to 2.10.6
 
diff --git a/monodir.c b/monodir.c
deleted file mode 100644
index 3836a94..0000000
--- a/monodir.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-int
-main (int argc, char *argv[]) {
-  printf ("%s\n", MONODIR);
-}