diff --git a/mono-core-target-4.0.patch b/mono-core-target-4.0.patch
new file mode 100644
index 0000000..7d10723
--- /dev/null
+++ b/mono-core-target-4.0.patch
@@ -0,0 +1,31 @@
+Index: mono-3.0.3/data/mono-cairo.pc.in
+===================================================================
+--- mono-3.0.3.orig/data/mono-cairo.pc.in
++++ mono-3.0.3/data/mono-cairo.pc.in
+@@ -6,4 +6,4 @@ 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:${prefix}/lib/mono/4.0/Mono.Cairo.dll
+Index: mono-3.0.3/data/mono-nunit.pc.in
+===================================================================
+--- mono-3.0.3.orig/data/mono-nunit.pc.in
++++ mono-3.0.3/data/mono-nunit.pc.in
+@@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib
+ Name: Mono NUnit
+ Description: Mono's version of NUnit
+ Version: @VERSION@
+-Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll 
++Libs: -r:${libdir}/mono/4.0/nunit.core.dll -r:${libdir}/mono/4.0/nunit.core.interfaces.dll -r:${libdir}/mono/4.0/nunit.core.extensions.dll -r:${libdir}/mono/4.0/nunit.framework.dll -r:${libdir}/mono/4.0/nunit.framework.extensions.dll -r:${libdir}/mono/4.0/nunit.mocks.dll -r:${libdir}/mono/4.0/nunit.util.dll -r:${libdir}/mono/4.0/nunit-console-runner.dll 
+Index: mono-3.0.3/data/mono.web.pc.in
+===================================================================
+--- mono-3.0.3.orig/data/mono.web.pc.in
++++ mono-3.0.3/data/mono.web.pc.in
+@@ -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
++Version: 4.0.0.0
++Libs: -r:@prefix@/lib/mono/gac/Mono.Web/4.0.0.0__0738eb9f132ed756/Mono.Web.dll
diff --git a/mono-core.changes b/mono-core.changes
index 92ebb5a..e2ee7ca 100644
--- a/mono-core.changes
+++ b/mono-core.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 29 08:15:12 UTC 2013 - dimstar@opensuse.org
+
+- Add mono-core-target-4.0.patch: Use .Net runtime 4.0 as default
+  for Nunit and Cairo.
+
 -------------------------------------------------------------------
 Fri Jan 11 11:41:47 UTC 2013 - mailaender@opensuse.org
 
diff --git a/mono-core.spec b/mono-core.spec
index c638e5a..6b236ad 100644
--- a/mono-core.spec
+++ b/mono-core.spec
@@ -41,6 +41,8 @@ Patch2:         mono-arm-cpuinfo-v7.patch
 Patch3:         mono-arm-vfp.patch
 # PATCH-FIX-OPENSUSE ppc.patch dvaleev@suse.com -- fix ppc build failures
 Patch4:         ppc.patch
+# PATCH-FIX-UPSTREAM mono-core-target-4.0.patch dimstar@opensuse.org -- Use runtime 4.0 as default for cairo and nunit
+Patch5:         mono-core-target-4.0.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -115,6 +117,7 @@ technologies that have been submitted to the ECMA for standardization.
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1
 
 %build
 # These are only needed if there are patches to the runtime