diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 6721f672497..8d5aa138645 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2009/02/03 09:41:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2009/03/15 02:19:31 kurt Exp $
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 COMMENT=	cross platform, open source .NET developement framework
 
 DISTNAME=	mono-2.0
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	lang devel
 
 SHARED_LIBS=	mono-profiler-aot	0.0 \
@@ -44,7 +44,7 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--with-gc=boehm --with-glib=system --with-tls=pthread \
 		--with-jit=yes --with-interp=no --with-sigaltstack=no \
-		--with-libgdiplus=installed
+		--with-libgdiplus=installed --disable-shared-handles
 
 REGRESS_TARGET=check
 
diff --git a/lang/mono/patches/patch-mono_os_gc_wrapper_h b/lang/mono/patches/patch-mono_os_gc_wrapper_h
new file mode 100644
index 00000000000..c5096a59656
--- /dev/null
+++ b/lang/mono/patches/patch-mono_os_gc_wrapper_h
@@ -0,0 +1,16 @@
+$OpenBSD: patch-mono_os_gc_wrapper_h,v 1.1 2009/03/15 02:19:31 kurt Exp $
+--- mono/os/gc_wrapper.h.orig	Thu Mar 12 13:08:25 2009
++++ mono/os/gc_wrapper.h	Thu Mar 12 13:14:30 2009
+@@ -29,6 +29,12 @@
+ #       endif
+ #	endif
+ 
++	/*
++	 * In the case of multithreaded code, gc.h should be included
++	 * after the threads header file, and after defining GC_THREADS.
++	 */
++#	include <pthread.h>
++#	define GC_THREADS
+ #	ifdef HAVE_GC_GC_H
+ #		include <gc/gc.h>
+ #		include <gc/gc_typed.h>