diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index a5711e4c4f4..b345c224e9a 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/03/21 17:35:05 robert Exp $
+# $OpenBSD: Makefile,v 1.20 2010/03/22 09:48:15 robert Exp $
 
 # sync with net/avahi,-mono
 ONLY_FOR_ARCHS=	amd64 i386 powerpc # arm
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS=	amd64 i386 powerpc # arm
 COMMENT=	cross platform, open source .NET developement framework
 
 DISTNAME=	mono-2.6.3
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 
 CATEGORIES=	lang devel
 
@@ -31,7 +31,11 @@ MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mono/
 EXTRACT_SUFX=	.tar.bz2
 
 MODULES=	devel/gettext \
-		lang/mono
+		lang/mono \
+		gcc4
+
+MODGCC4_ARCHES=	*
+MODGCC4_LANGS=	c
 
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes
diff --git a/lang/mono/patches/patch-mono_mini_mini_c b/lang/mono/patches/patch-mono_mini_mini_c
index e36956113f6..b19a0d6f829 100644
--- a/lang/mono/patches/patch-mono_mini_mini_c
+++ b/lang/mono/patches/patch-mono_mini_mini_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-mono_mini_mini_c,v 1.2 2010/03/21 17:35:05 robert Exp $
+$OpenBSD: patch-mono_mini_mini_c,v 1.3 2010/03/22 09:48:15 robert Exp $
 --- mono/mini/mini.c.orig	Thu Feb 25 16:20:57 2010
-+++ mono/mini/mini.c	Sun Mar 21 17:59:55 2010
-@@ -4773,18 +4773,22 @@ SIG_HANDLER_SIGNATURE (mono_sigill_signal_handler)
++++ mono/mini/mini.c	Mon Mar 22 10:22:30 2010
+@@ -4773,18 +4773,19 @@ SIG_HANDLER_SIGNATURE (mono_sigill_signal_handler)
  	mono_arch_handle_exception (ctx, exc, FALSE);
  }
  
@@ -17,9 +17,6 @@ $OpenBSD: patch-mono_mini_mini_c,v 1.2 2010/03/21 17:35:05 robert Exp $
 -#endif
  	MonoJitInfo *ji;
  	MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
-+#if !(defined(MONO_ARCH_USE_SIGACTION) || defined(PLATFORM_WIN32))
-+	siginfo_t *info;
-+#endif
  
  	GET_CONTEXT;
  
@@ -28,7 +25,7 @@ $OpenBSD: patch-mono_mini_mini_c,v 1.2 2010/03/21 17:35:05 robert Exp $
  	if (mono_arch_is_single_step_event (info, ctx)) {
  		mono_debugger_agent_single_step_event (ctx);
  		return;
-@@ -4794,7 +4798,7 @@ SIG_HANDLER_SIGNATURE (mono_sigsegv_signal_handler)
+@@ -4794,7 +4795,7 @@ SIG_HANDLER_SIGNATURE (mono_sigsegv_signal_handler)
  	}
  #endif
  
@@ -37,7 +34,7 @@ $OpenBSD: patch-mono_mini_mini_c,v 1.2 2010/03/21 17:35:05 robert Exp $
  	if (mono_aot_is_pagefault (info->si_addr)) {
  		mono_aot_handle_pagefault (info->si_addr);
  		return;
-@@ -4844,7 +4848,7 @@ SIG_HANDLER_SIGNATURE (mono_sigsegv_signal_handler)
+@@ -4844,7 +4845,7 @@ SIG_HANDLER_SIGNATURE (mono_sigsegv_signal_handler)
  		mono_handle_native_sigsegv (SIGSEGV, ctx);
  	}