diff --git a/.gitignore b/.gitignore
index 8869ba4..d641558 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mono-cecil-0.9.5-6d1b7d0.tar.gz
+/cecil-*.tar.gz
diff --git a/mono-cecil.spec b/mono-cecil.spec
index 31ff4a3..a1a9b1a 100644
--- a/mono-cecil.spec
+++ b/mono-cecil.spec
@@ -1,22 +1,23 @@
+%if 0%{?rhel}%{?el6}%{?el7}
+# see https://fedorahosted.org/fpc/ticket/395
+%define _monodir %{_prefix}/lib/mono
+%define _monogacdir %{_monodir}/gac
+%endif
+
 Name:           mono-cecil
-Version:        0.9.5
-%global commit 6d1b7d0bc02cea62aa7a950c049bd615a0ad4183
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global snapshot 20140924git%{shortcommit}
-Release:        3.%{snapshot}%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        Library to generate and inspect programs and libraries in the ECMA CIL form
 License:        MIT
 URL:            http://www.mono-project.com/Cecil
-Source0:        https://github.com/jbevain/cecil/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Source0:        https://github.com/jbevain/cecil/archive/%{version}/cecil-%{version}.tar.gz
 Patch0:         %{name}-nobuild-tests.patch
-BuildArch:      noarch
+# JIT only available on these:
+ExclusiveArch:  %mono_arches
 BuildRequires:  mono(xbuild)
 Requires:       mono-core
 
-# TODO Remove once defined as standard macro
-%global monodir /usr/lib/mono
-
-%global configuration net_3_5_Release
+%global configuration net_4_5_Release
 
 %description
 Cecil is a library written by Jb Evain to generate and inspect programs and
@@ -31,17 +32,16 @@ Today it is used by the Mono Debugger, the bug-finding and compliance checking
 tool Gendarme, MoMA, DB4O, as well as many other tools.
 
 %prep
-%setup -qn cecil-%{commit}
+%setup -qn cecil-%{version}
 
 # bundles nunit and we don't use them anyway
-rm Test -rf
 %patch0 -p1
 
 %build
 xbuild Mono.Cecil.sln /p:Configuration=%{configuration}
 
 %install
-mkdir -p %{buildroot}%{monodir}/gac/
+mkdir -p %{buildroot}%{monogacdir}/
 cd bin/%{configuration}/
 gacutil -i Mono.Cecil.dll -f -package Mono.Cecil -root %{buildroot}/usr/lib
 gacutil -i Mono.Cecil.Mdb.dll -f -package Mono.Cecil -root %{buildroot}/usr/lib
@@ -50,11 +50,15 @@ gacutil -i Mono.Cecil.Rocks.dll -f -package Mono.Cecil -root %{buildroot}/usr/li
 cd -
 
 %files
-%doc NOTES.txt
-%{monodir}/gac/Mono.Cecil*
-%{monodir}/Mono.Cecil*
+%doc
+%{_monogacdir}/Mono.Cecil*
+%{_monodir}/Mono.Cecil*
 
 %changelog
+* Mon May 11 2015 Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org> 0.9.6-1
+- Build for Mono 4
+- Update to 0.9.6
+
 * Sat Oct 25 2014 Miro Hrončok <mhroncok@redhat.com> - 0.9.5-3.20140924git6d1b7d0
 - Updated
 - Remove bundled nunit
diff --git a/sources b/sources
index 4938c26..1924f80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa093c10aa6db6b02f51dea9dcab4db2  mono-cecil-0.9.5-6d1b7d0.tar.gz
+eeb44863954ceb25203482029d81861f  cecil-0.9.6.tar.gz