diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index aa4d79bbd8e..405d74b70c5 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2010/03/28 15:25:15 robert Exp $
+# $OpenBSD: Makefile,v 1.34 2010/04/01 21:53:51 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}p12
+PKGNAME=	${DISTNAME}p13
 
 CATEGORIES=	lang devel
 
@@ -50,16 +50,16 @@ CONFIGURE_STYLE=autoconf
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LC_ALL=C
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
-                --with-gc=boehm \
-                --with-glib=system \
-                --with-tls=pthread \
-                --with-jit=yes \
-                --with-interp=no \
-                --with-sigaltstack=no \
-                --with-libgdiplus=installed \
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--with-gc=boehm \
+		--with-glib=system \
+		--with-tls=pthread \
+		--with-jit=yes \
+		--with-interp=no \
+		--with-sigaltstack=no \
+		--with-libgdiplus=installed \
 		--enable-quiet-build=no \
-                --disable-shared-handles
+		--disable-shared-handles
 
 REGRESS_TARGET=check
 
@@ -81,8 +81,6 @@ BASH_SCRIPTS=	mcs/class/Mono.WebBrowser/build-csproj2k5 \
 		scripts/mono-find-requires.in \
 		scripts/mono-find-provides.in \
 		scripts/mono-test-install \
-		web/mono-build-w32.sh \
-		build-mingw32.sh \
 		mono/arch/arm/dpiops.sh
 
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples
diff --git a/lang/mono/patches/patch-mono_metadata_threads_c b/lang/mono/patches/patch-mono_metadata_threads_c
new file mode 100644
index 00000000000..7c902fed485
--- /dev/null
+++ b/lang/mono/patches/patch-mono_metadata_threads_c
@@ -0,0 +1,42 @@
+$OpenBSD: patch-mono_metadata_threads_c,v 1.1 2010/04/01 21:53:51 robert Exp $
+--- mono/metadata/threads.c.orig	Thu Apr  1 21:28:08 2010
++++ mono/metadata/threads.c	Thu Apr  1 21:36:45 2010
+@@ -15,6 +15,10 @@
+ #include <glib.h>
+ #include <signal.h>
+ #include <string.h>
++#if defined(__OpenBSD__)
++#include <pthread.h>
++#include <pthread_np.h>
++#endif
+ 
+ #include <mono/metadata/object.h>
+ #include <mono/metadata/domain-internals.h>
+@@ -855,6 +859,15 @@ mono_thread_get_stack_bounds (guint8 **staddr, size_t 
+ #    elif defined(sun)
+ 	*staddr = NULL;
+ 	pthread_attr_getstacksize (&attr, &stsize);
++#    elif defined(__OpenBSD__)
++	stack_t ss;
++	int rslt;
++
++	rslt = pthread_stackseg_np(pthread_self(), &ss);
++	g_assert (rslt == 0);
++
++	*staddr = (guint8*)((size_t)ss.ss_sp - ss.ss_size);
++	*stsize = ss.ss_size;
+ #    else
+ 	*staddr = NULL;
+ 	*stsize = 0;
+@@ -862,8 +875,10 @@ mono_thread_get_stack_bounds (guint8 **staddr, size_t 
+ #    endif
+ #  endif
+ 
+-#  ifndef sun
++#  if !defined(sun)
++#    if !defined(__OpenBSD__)
+ 	pthread_attr_getstack (&attr, (void**)staddr, stsize);
++#    endif
+ 	if (*staddr)
+ 		g_assert ((current > *staddr) && (current < *staddr + *stsize));
+ #  endif
diff --git a/lang/mono/patches/patch-mono_tests_Makefile_in b/lang/mono/patches/patch-mono_tests_Makefile_in
new file mode 100644
index 00000000000..9043364dbaa
--- /dev/null
+++ b/lang/mono/patches/patch-mono_tests_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-mono_tests_Makefile_in,v 1.1 2010/04/01 21:53:51 robert Exp $
+--- mono/tests/Makefile.in.orig	Thu Apr  1 21:54:21 2010
++++ mono/tests/Makefile.in	Thu Apr  1 21:54:27 2010
+@@ -1278,7 +1278,7 @@ test-type-load: TestDriver.dll
+ 	@$(MCS) -r:TestDriver.dll -r:load-missing.dll -r:t.dll -out:load-exceptions.exe $(srcdir)/load-exceptions.cs
+ 	@$(MCS) -t:library -out:t.dll $(srcdir)/t-missing.cs
+ 	@echo "Testing load-exception.exe..."
+-	@$(RUNTIME) load-exceptions.exe > load-exceptions.exe.stdout 2> load-exceptions.exe.stderr
++	-@$(RUNTIME) load-exceptions.exe > load-exceptions.exe.stdout 2> load-exceptions.exe.stderr
+ test-runtime-invoke: TestDriver.dll gen-runtime-invoke.exe
+ 	@$(RUNTIME) gen-runtime-invoke.exe > runtime-invoke.gen.cs
+ 	@$(MCS) -out:runtime-invoke.gen.exe -r:TestDriver.dll runtime-invoke.gen.cs