diff --git a/boo-gtksourceview.patch b/boo-gtksourceview.patch
deleted file mode 100644
index 7c2cedb..0000000
--- a/boo-gtksourceview.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uraN boo-0.9.4.9/default.build boo-0.9.4.9.orig/default.build
---- boo-0.9.4.9/default.build	2011-01-20 13:25:04.000000000 +0100
-+++ boo-0.9.4.9.orig/default.build	2011-02-19 22:53:14.708570456 +0100
-@@ -579,7 +579,7 @@
- 
- 		<property name="sharedmime.prefix" value="${pkg-config::get-variable('shared-mime-info','prefix')}" />
- 		<property name="fakeroot.sharedmime" value="${install.destdir}/${sharedmime.prefix}" />
--		<property name="gsv.prefix" value="${pkg-config::get-variable('gtksourceview-1.0','prefix')}" />
-+		<property name="gsv.prefix" value="${pkg-config::get-variable('gtksourceview-2.0','prefix')}" />
- 		<property name="fakeroot.gsv" value="${install.destdir}/${gsv.prefix}" />
- 
- 		<mkdir dir="${fakeroot.boolib}"/>
diff --git a/boo.spec b/boo.spec
index 69d4cd1..5e8d960 100644
--- a/boo.spec
+++ b/boo.spec
@@ -1,24 +1,23 @@
-%define debug_package %{nil}
-%define monodir %{_prefix}/lib
+%global debug_package %{nil}
+%global monoprefix %{_prefix}/lib
 
 Summary: An OO statically typed language for CLI
 Name: boo
 Version: 0.9.4.9
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: MIT
 Group: Development/Languages
 URL: http://boo.codehaus.org
 
 Source0: http://dist.codehaus.org/boo/distributions/%{name}-%{version}-src.tar.bz2
 Patch0: boo-pkgconfig_path_fix.patch
-Patch1: boo-gtksourceview.patch
 BuildRequires: mono-devel, gtksourceview2-devel, shared-mime-info, pkgconfig, nant
 # Mono only available on these:
-ExclusiveArch: %mono_arches
+ExclusiveArch: %{mono_arches}
 
 %description
-Boo is a new object oriented statically typed programming language for the 
-Common Language Infrastructure with a python inspired syntax and a special 
+Boo is a new object oriented statically typed programming language for the
+Common Language Infrastructure with a python inspired syntax and a special
 focus on language and compiler extensibility.
 
 %package devel
@@ -32,19 +31,35 @@ Development files for boo
 %prep
 %setup -q
 %patch0 -p1 -b .pc-original
-%patch1 -p1 -b .sourceview
 
 # Get rid of prebuilt dll files
 rm -rf bin/*.dll bin/pt/*.dll
+rm -rf bin/*.exe bin/pt/*.exe
+rm -rf bin/*.config bin/pt/*.config
+
+# Mono 4 rename assemblies with v4.0 sufix
+sed -i 's#include name="Microsoft.Build.Utilities.dll"#include name="Microsoft.Build.Utilities.v4.0.dll"#g' default.build
+sed -i 's#include name="Microsoft.Build.Tasks.dll"#include name="Microsoft.Build.Tasks.v4.0.dll"#g' default.build
+
+# Fix gtksourceview version
+sed -i "s#gtksourceview-1.0#gtksourceview-2.0#g" default.build
+
+# Temporary workaround: disable verification of assemblies because pedump currently segfaults on Rawhide
+sed -i 's#<call target="verify-assemblies" />##g' default.build
+
+# Create directory to avoid nant install error because of non-existing directory build/pt.
+# the content of build/pt was deleted because it contained prebuilt dll files
+mkdir -p build/pt
 
 %build
-nant -D:install.prefix=%{_prefix} -D:install.libdir=%{monodir}
+nant -D:install.prefix=%{_prefix}
 
 %install
-nant -f:default.build install -D:install.buildroot=%{buildroot} -D:install.prefix=%{buildroot}%{_prefix} -D:install.share=%{buildroot}%{_datadir} -D:install.libdir=%{buildroot}%{monodir} -D:install.bindir=%{buildroot}%{_bindir} -D:fakeroot.sharedmime=%{buildroot}%{_datadir}/.. -D:fakeroot.gsv=%{buildroot}%{_prefix}
+nant -f:default.build install -D:install.prefix=%{_prefix} -D:install.destdir=%{buildroot}
 
+#Locate pc file into correct libdir
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgconfig/* $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+test "%{_libdir}" = "%{monoprefix}" || mv $RPM_BUILD_ROOT%{monoprefix}/pkgconfig/* $RPM_BUILD_ROOT%{_libdir}/pkgconfig/
 
 
 %post
@@ -58,23 +73,28 @@ fi
 %posttrans
 /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
-%files 
-%doc license.txt notice.txt readme.txt docs/BooManifesto.sxw
-%{monodir}/boo*/
-%exclude %{monodir}/boo/Boo.NAnt.Tasks.dll
-%dir %{monodir}/mono/boo
-%{monodir}/mono/boo/*.dll
-%{monodir}/mono/gac/Boo*/
+%files
+%doc notice.txt readme.txt docs/BooManifesto.sxw
+%license license.txt
+%{monoprefix}/boo*/
+%exclude %{monoprefix}/boo/Boo.NAnt.Tasks.dll
+%dir %{_monodir}/boo
+%{_monodir}/boo/*.dll
+%{_monogacdir}/Boo*/
 %{_bindir}/boo*
-%exclude %{_datadir}/gtksourceview-1.0/language-specs/boo.lang
+%{_datadir}/gtksourceview-2.0/language-specs/boo.lang
 %{_datadir}/mime/packages/boo*
 %{_datadir}/mime-info/boo*
 
 %files devel
 %{_libdir}/pkgconfig/boo.pc
-%{monodir}/boo/Boo.NAnt.Tasks.dll
+%{monoprefix}/boo/Boo.NAnt.Tasks.dll
 
 %changelog
+* Wed Jun 17 2015 Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org> 0.9.4.9-14
+- Fix for build for mono 4
+- Use mono macros
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4.9-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
@@ -136,7 +156,7 @@ fi
 - Fix executable paths
 
 * Thu Aug 27 2009 Michel Salim <salimma@fedoraproject.org> - 0.9.1.3287-2
-- Fix libdir in boo.pc to use %{_libdir}
+- Fix libdir in boo.pc to use %%{_libdir}
 - Summary no longer repeats package name
 
 * Sun Aug 02 2009 Paul Lange <palango@gmx.de> - 0.9.1.3287-1