diff --git a/mono-debugger-0.60-noasmuser.patch b/mono-debugger-0.60-noasmuser.patch
new file mode 100644
index 0000000..c0e3bfc
--- /dev/null
+++ b/mono-debugger-0.60-noasmuser.patch
@@ -0,0 +1,51 @@
+diff -up mono-debugger-0.60/backend/server/i386-arch.h.BAD mono-debugger-0.60/backend/server/i386-arch.h
+--- mono-debugger-0.60/backend/server/i386-arch.h.BAD	2008-04-11 16:16:13.000000000 -0400
++++ mono-debugger-0.60/backend/server/i386-arch.h	2008-04-11 16:20:26.000000000 -0400
+@@ -7,10 +7,10 @@ G_BEGIN_DECLS
+ 
+ #if defined(__i386__)
+ 
+-#include <asm/user.h>
++#include <sys/user.h>
+ 
+ #define INFERIOR_REGS_TYPE	struct user_regs_struct
+-#define INFERIOR_FPREGS_TYPE	struct user_i387_struct
++#define INFERIOR_FPREGS_TYPE	struct user_fpregs_struct
+ 
+ #define INFERIOR_REG_EIP(r)	r.eip
+ #define INFERIOR_REG_ESP(r)	r.esp
+@@ -23,12 +23,12 @@ G_BEGIN_DECLS
+ #define INFERIOR_REG_EDI(r)	r.edi
+ #define INFERIOR_REG_EFLAGS(r)	r.eflags
+ #define INFERIOR_REG_ESP(r)	r.esp
+-#define INFERIOR_REG_FS(r)	r.fs
+-#define INFERIOR_REG_ES(r)	r.es
+-#define INFERIOR_REG_DS(r)	r.ds
+-#define INFERIOR_REG_CS(r)	r.cs
+-#define INFERIOR_REG_SS(r)	r.ss
+-#define INFERIOR_REG_GS(r)	r.gs
++#define INFERIOR_REG_FS(r)	r.xfs
++#define INFERIOR_REG_ES(r)	r.xes
++#define INFERIOR_REG_DS(r)	r.xds
++#define INFERIOR_REG_CS(r)	r.xcs
++#define INFERIOR_REG_SS(r)	r.xss
++#define INFERIOR_REG_GS(r)	r.xgs
+ 
+ G_END_DECLS
+ 
+diff -up mono-debugger-0.60/backend/server/x86_64-arch.h.BAD mono-debugger-0.60/backend/server/x86_64-arch.h
+--- mono-debugger-0.60/backend/server/x86_64-arch.h.BAD	2008-04-11 16:16:35.000000000 -0400
++++ mono-debugger-0.60/backend/server/x86_64-arch.h	2008-04-11 16:21:16.000000000 -0400
+@@ -7,10 +7,10 @@ G_BEGIN_DECLS
+ 
+ #if defined(__x86_64__)
+ 
+-#include <asm/user.h>
++#include <sys/user.h>
+ 
+ #define INFERIOR_REGS_TYPE	struct user_regs_struct
+-#define INFERIOR_FPREGS_TYPE	struct user_i387_struct
++#define INFERIOR_FPREGS_TYPE	struct user_fpregs_struct
+ 
+ #define INFERIOR_REG_R15(r)	r.r15
+ #define INFERIOR_REG_R14(r)	r.r14
diff --git a/mono-debugger-0.60-use-system-cecil.patch b/mono-debugger-0.60-use-system-cecil.patch
new file mode 100644
index 0000000..48a60ae
--- /dev/null
+++ b/mono-debugger-0.60-use-system-cecil.patch
@@ -0,0 +1,131 @@
+diff -up mono-debugger-0.60/build/Makefile.am.BAD mono-debugger-0.60/build/Makefile.am
+--- mono-debugger-0.60/build/Makefile.am.BAD	2008-04-11 16:45:57.000000000 -0400
++++ mono-debugger-0.60/build/Makefile.am	2008-04-11 16:46:47.000000000 -0400
+@@ -12,7 +12,7 @@ noinst_SCRIPTS = \
+ 	Mono.Debugger.Frontend.dll			\
+ 	Mono.Debugger.Test.dll
+ 
+-EXTRA_DATA = Mono.Debugger.Cecil.dll
++EXTRA_DATA = Mono.Cecil.dll
+ 
+ LANGUAGE_SPECIFIC_FILES = \
+ 	$(top_builddir)/frontend/CSharpExpressionParser.cs	\
+@@ -61,7 +61,7 @@ BACKEND_DEPS = \
+ 	-r:Mono.GetOptions				\
+ 	-r:Mono.CompilerServices.SymbolWriter		\
+ 	-r:System.Runtime.Serialization.Formatters.Soap	\
+-	-r:$(srcdir)/Mono.Debugger.Cecil.dll		\
++	-r:$(srcdir)/Mono.Cecil.dll			\
+ 	-r:./Mono.Debugger.dll
+ 
+ MDB_DEPS = \
+@@ -77,7 +77,7 @@ TEST_DEPS = \
+ 	-r:./Mono.Debugger.Frontend.dll			\
+ 	-r:nunit.framework
+ 
+-Mono.Debugger.Backend.dll: Makefile $(srcdir)/Mono.Debugger.Cecil.dll $(BACKEND_SRCLIST) Mono.Debugger.dll
++Mono.Debugger.Backend.dll: Makefile $(srcdir)/Mono.Cecil.dll $(BACKEND_SRCLIST) Mono.Debugger.dll
+ 	$(MCS) -target:library -out:Mono.Debugger.Backend.dll $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk -resource:$(top_srcdir)/classes/DebuggerConfiguration.xsd,DebuggerConfiguration $(BACKEND_DEPS) $(BACKEND_SRCLIST)
+ 
+ Mono.Debugger.dll: Makefile $(INTERFACE_SRCLIST)
+@@ -89,8 +89,8 @@ Mono.Debugger.Frontend.dll: Makefile $(M
+ Mono.Debugger.Test.dll: Makefile $(TEST_SRCLIST) Mono.Debugger.dll Mono.Debugger.Frontend.dll
+ 	$(MCS) -target:library -out:Mono.Debugger.Test.dll $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk $(TEST_DEPS) $(TEST_SRCLIST)
+ 
+-#Mono.Debugger.Cecil.dll: Makefile $(top_srcdir)/cecil/lib/Mono.Cecil.dll.sources
+-#	(dir=`pwd` && cd $(top_srcdir)/cecil/lib && $(MCS) -target:library -out:$$dir/Mono.Debugger.Cecil.dll $(MCS_FLAGS) @Mono.Cecil.dll.sources -keyfile:$(top_srcdir)/build/mono.snk)
++#Mono.Cecil.dll: Makefile $(top_srcdir)/cecil/lib/Mono.Cecil.dll.sources
++#	(dir=`pwd` && cd $(top_srcdir)/cecil/lib && $(MCS) -target:library -out:$$dir/Mono.Cecil.dll $(MCS_FLAGS) @Mono.Cecil.dll.sources -keyfile:$(top_srcdir)/build/mono.snk)
+ 
+ mdb.exe: Makefile $(MDB_SRCLIST) Mono.Debugger.Backend.dll
+ 	$(MCS) -out:mdb.exe $(MDB_DEPS) $(MDB_SRCLIST) $(MCS_FLAGS)
+@@ -114,21 +114,20 @@ CLEANFILES = *.exe *.mdb mdb AssemblyInf
+ 
+ EXTRA_DIST = \
+ 	mdb.in mono.snk AssemblyInfo.cs.in Mono.Debugger.dll.config.in \
+-	Mono.Debugger.Cecil.dll
++	Mono.Cecil.dll
+ 
+ mdb: mdb.in Makefile
+ 	sed -e 's^\@onedir\@^$(onedir)^g' < $(srcdir)/mdb.in > mdb.tmp \
+ 	&& mv mdb.tmp mdb 
+ 
+ install-data-local:
+-	$(GACUTIL) /i $(srcdir)/Mono.Debugger.Cecil.dll /f $(GACUTIL_FLAGS) || exit 1;
+ 	$(GACUTIL) /i Mono.Debugger.Backend.dll /f $(GACUTIL_FLAGS) || exit 1;
+ 	$(GACUTIL) /i Mono.Debugger.dll /f $(GACUTIL_FLAGS) || exit 1;
+ 
+ uninstall-local:
+ 	$(GACUTIL) /u Mono.Debugger $(GACUTIL_FLAGS) || exit 1;
+ 	$(GACUTIL) /u Mono.Debugger.Backend $(GACUTIL_FLAGS) || exit 1;
+-	$(GACUTIL) /u Mono.Debugger.Cecil $(GACUTIL_FLAGS) || exit 1;
++	$(GACUTIL) /u Mono.Cecil $(GACUTIL_FLAGS) || exit 1;
+ 
+ NUNIT_CONSOLE_FLAGS =
+ 
+diff -up mono-debugger-0.60/build/Makefile.in.BAD mono-debugger-0.60/build/Makefile.in
+--- mono-debugger-0.60/build/Makefile.in.BAD	2008-04-11 16:43:50.000000000 -0400
++++ mono-debugger-0.60/build/Makefile.in	2008-04-11 16:47:07.000000000 -0400
+@@ -201,7 +201,7 @@ noinst_SCRIPTS = \
+ 	Mono.Debugger.Frontend.dll			\
+ 	Mono.Debugger.Test.dll
+ 
+-EXTRA_DATA = Mono.Debugger.Cecil.dll
++EXTRA_DATA = Mono.Cecil.dll
+ LANGUAGE_SPECIFIC_FILES = \
+ 	$(top_builddir)/frontend/CSharpExpressionParser.cs	\
+ 	$(top_srcdir)/frontend/CSharpTokenizer.cs
+@@ -249,7 +249,7 @@ BACKEND_DEPS = \
+ 	-r:Mono.GetOptions				\
+ 	-r:Mono.CompilerServices.SymbolWriter		\
+ 	-r:System.Runtime.Serialization.Formatters.Soap	\
+-	-r:$(srcdir)/Mono.Debugger.Cecil.dll		\
++	-r:$(srcdir)/Mono.Cecil.dll			\
+ 	-r:./Mono.Debugger.dll
+ 
+ MDB_DEPS = \
+@@ -273,7 +273,7 @@ CLEANFILES = *.exe *.mdb mdb AssemblyInf
+ 
+ EXTRA_DIST = \
+ 	mdb.in mono.snk AssemblyInfo.cs.in Mono.Debugger.dll.config.in \
+-	Mono.Debugger.Cecil.dll
++	Mono.Cecil.dll
+ 
+ NUNIT_CONSOLE_FLAGS = 
+ all: all-am
+@@ -493,7 +493,7 @@ uninstall-am: uninstall-binSCRIPTS unins
+ 	uninstall-binSCRIPTS uninstall-local uninstall-oneSCRIPTS
+ 
+ 
+-Mono.Debugger.Backend.dll: Makefile $(srcdir)/Mono.Debugger.Cecil.dll $(BACKEND_SRCLIST) Mono.Debugger.dll
++Mono.Debugger.Backend.dll: Makefile $(srcdir)/Mono.Cecil.dll $(BACKEND_SRCLIST) Mono.Debugger.dll
+ 	$(MCS) -target:library -out:Mono.Debugger.Backend.dll $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk -resource:$(top_srcdir)/classes/DebuggerConfiguration.xsd,DebuggerConfiguration $(BACKEND_DEPS) $(BACKEND_SRCLIST)
+ 
+ Mono.Debugger.dll: Makefile $(INTERFACE_SRCLIST)
+@@ -505,8 +505,8 @@ Mono.Debugger.Frontend.dll: Makefile $(M
+ Mono.Debugger.Test.dll: Makefile $(TEST_SRCLIST) Mono.Debugger.dll Mono.Debugger.Frontend.dll
+ 	$(MCS) -target:library -out:Mono.Debugger.Test.dll $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk $(TEST_DEPS) $(TEST_SRCLIST)
+ 
+-#Mono.Debugger.Cecil.dll: Makefile $(top_srcdir)/cecil/lib/Mono.Cecil.dll.sources
+-#	(dir=`pwd` && cd $(top_srcdir)/cecil/lib && $(MCS) -target:library -out:$$dir/Mono.Debugger.Cecil.dll $(MCS_FLAGS) @Mono.Cecil.dll.sources -keyfile:$(top_srcdir)/build/mono.snk)
++#Mono.Cecil.dll: Makefile $(top_srcdir)/cecil/lib/Mono.Cecil.dll.sources
++#	(dir=`pwd` && cd $(top_srcdir)/cecil/lib && $(MCS) -target:library -out:$$dir/Mono.Cecil.dll $(MCS_FLAGS) @Mono.Cecil.dll.sources -keyfile:$(top_srcdir)/build/mono.snk)
+ 
+ mdb.exe: Makefile $(MDB_SRCLIST) Mono.Debugger.Backend.dll
+ 	$(MCS) -out:mdb.exe $(MDB_DEPS) $(MDB_SRCLIST) $(MCS_FLAGS)
+@@ -526,14 +526,13 @@ mdb: mdb.in Makefile
+ 	&& mv mdb.tmp mdb 
+ 
+ install-data-local:
+-	$(GACUTIL) /i $(srcdir)/Mono.Debugger.Cecil.dll /f $(GACUTIL_FLAGS) || exit 1;
+ 	$(GACUTIL) /i Mono.Debugger.Backend.dll /f $(GACUTIL_FLAGS) || exit 1;
+ 	$(GACUTIL) /i Mono.Debugger.dll /f $(GACUTIL_FLAGS) || exit 1;
+ 
+ uninstall-local:
+ 	$(GACUTIL) /u Mono.Debugger $(GACUTIL_FLAGS) || exit 1;
+ 	$(GACUTIL) /u Mono.Debugger.Backend $(GACUTIL_FLAGS) || exit 1;
+-	$(GACUTIL) /u Mono.Debugger.Cecil $(GACUTIL_FLAGS) || exit 1;
++	$(GACUTIL) /u Mono.Cecil $(GACUTIL_FLAGS) || exit 1;
+ 
+ check-local: Mono.Debugger.Test.dll $(TEST_CASE_SRCLIST)
+ 	LD_LIBRARY_PATH="$(top_builddir)/backend/server/.libs:$$LD_LIBRARY_PATH" $(NUNIT_CONSOLE) $(NUNIT_CONSOLE_FLAGS) /output:TestResult.log /exclude:NotWorking /xml:TestResult.xml Mono.Debugger.Test.dll || ok=false; \
diff --git a/mono-debugger.spec b/mono-debugger.spec
index 0356503..ad82715 100644
--- a/mono-debugger.spec
+++ b/mono-debugger.spec
@@ -1,12 +1,14 @@
 Summary: A debugger for Mono
 Name: mono-debugger
 Version: 0.60
-Release: 2.2%{?dist}
+Release: 3%{?dist}
 License: MIT
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.go-mono.com/sources-stable/
 Source0: http://www.go-mono.com/sources-stable/%{name}/%{name}-%{version}.tar.bz2
 Patch0: monodebug-configure.patch
+Patch1: mono-debugger-0.60-noasmuser.patch
+Patch2: mono-debugger-0.60-use-system-cecil.patch
 BuildRequires: readline-devel ncurses-devel libtool
 BuildRequires: mono-devel mono-nunit
 BuildRequires: mono-nunit-devel autoconf automake
@@ -35,6 +37,13 @@ Development package for mono-debugger
 %setup -q
 %patch0 -p1
 autoreconf
+%patch1 -p1
+rm -rf build/*.dll
+%patch2 -p1
+# 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/
+
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -56,20 +65,23 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog README README.FreeBSD TODO NEWS RELEASE-NOTES*
 %{_bindir}/mdb
-%{_libdir}/*.so.*
+%{_libdir}/*.so*
 %{_libdir}/mono/1.0/*.exe
 %{_libdir}/mono/mono-debugger/
 %{_libdir}/mono/gac/Mono.Debugger/
-%{_libdir}/mono/gac/Mono.Debugger.Cecil/
 %{_libdir}/mono/gac/Mono.Debugger.Backend/
 
 %files devel
 %defattr(-,root,root)
 %doc README.build
 %{_libdir}/pkgconfig/mono-debugger.pc
-%{_libdir}/libmono*.so
 
 %changelog
+* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.60-3
+- fix compile
+- use system Cecil, not prebundled binary Cecil
+- this thing is stupid, it needs the .so file to run, moving it to the main package
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.60-2.2
 - Autorebuild for GCC 4.3