diff --git a/devel/nant/Makefile b/devel/nant/Makefile
new file mode 100644
index 00000000000..0c17d7474ce
--- /dev/null
+++ b/devel/nant/Makefile
@@ -0,0 +1,34 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2010/04/05 01:13:44 robert Exp $
+
+COMMENT=	A .NET build tool inspired by Ant
+
+V=		0.86-beta1
+DISTNAME=	nant-${V}-src
+PKGNAME=	${DISTNAME:S/-src//}
+CATEGORIES=	devel lang
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nant/}
+
+HOMEPAGE=	http://nant.sourceforge.net/
+
+# GPLv2
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+
+USE_GMAKE=	Yes
+
+MODULES=	lang/mono
+BUILD_DEPENDS=	${RUN_DEPENDS}
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+WRKDIST=	${WRKSRC}
+
+MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX}
+
+post-patch:
+	@find ${WRKSRC}/src ${WRKSRC}/tests -name '*.build' \
+		-exec perl -pi -e \
+		's|warnaserror="true"|warnaserror="false"|g;' {} \;
+
+.include <bsd.port.mk>
diff --git a/devel/nant/distinfo b/devel/nant/distinfo
new file mode 100644
index 00000000000..7363853aa8a
--- /dev/null
+++ b/devel/nant/distinfo
@@ -0,0 +1,5 @@
+MD5 (nant-0.86-beta1-src.tar.gz) = bl5bpFFb3lZowIWAcyKh8w==
+RMD160 (nant-0.86-beta1-src.tar.gz) = ljQ8MEA7t0DlLVFojIVXOKgCG78=
+SHA1 (nant-0.86-beta1-src.tar.gz) = n5E4G5xURZxcxW4x5GReRwo8vps=
+SHA256 (nant-0.86-beta1-src.tar.gz) = v5wkWyD/5qKkSBT6Cgp5o9Z7TAS3Qhi4mbQwl1tPDb0=
+SIZE (nant-0.86-beta1-src.tar.gz) = 2187213
diff --git a/devel/nant/pkg/DESCR b/devel/nant/pkg/DESCR
new file mode 100644
index 00000000000..1b664579a43
--- /dev/null
+++ b/devel/nant/pkg/DESCR
@@ -0,0 +1,2 @@
+NAnt is a .NET based build tool. In theory it is kind of like make without
+make's wrinkles. In practice it's a lot like Ant.
diff --git a/devel/nant/pkg/PLIST b/devel/nant/pkg/PLIST
new file mode 100644
index 00000000000..5f628c335dd
--- /dev/null
+++ b/devel/nant/pkg/PLIST
@@ -0,0 +1,90 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2010/04/05 01:13:44 robert Exp $
+bin/nant
+share/NAnt/
+share/NAnt/bin/
+share/NAnt/bin/NAnt.CompressionTasks.dll
+share/NAnt/bin/NAnt.CompressionTasks.dll.mdb
+share/NAnt/bin/NAnt.CompressionTasks.xml
+share/NAnt/bin/NAnt.Core.dll
+share/NAnt/bin/NAnt.Core.dll.mdb
+share/NAnt/bin/NAnt.Core.xml
+share/NAnt/bin/NAnt.DotNetTasks.dll
+share/NAnt/bin/NAnt.DotNetTasks.dll.mdb
+share/NAnt/bin/NAnt.DotNetTasks.xml
+share/NAnt/bin/NAnt.NUnit.dll
+share/NAnt/bin/NAnt.NUnit.dll.mdb
+share/NAnt/bin/NAnt.NUnit.xml
+share/NAnt/bin/NAnt.NUnit1Tasks.dll
+share/NAnt/bin/NAnt.NUnit1Tasks.dll.mdb
+share/NAnt/bin/NAnt.NUnit1Tasks.xml
+share/NAnt/bin/NAnt.NUnit2Tasks.dll
+share/NAnt/bin/NAnt.NUnit2Tasks.dll.mdb
+share/NAnt/bin/NAnt.NUnit2Tasks.xml
+share/NAnt/bin/NAnt.SourceControlTasks.dll
+share/NAnt/bin/NAnt.SourceControlTasks.dll.mdb
+share/NAnt/bin/NAnt.SourceControlTasks.xml
+share/NAnt/bin/NAnt.VSNetTasks.dll
+share/NAnt/bin/NAnt.VSNetTasks.dll.mdb
+share/NAnt/bin/NAnt.VSNetTasks.xml
+share/NAnt/bin/NAnt.VisualCppTasks.dll
+share/NAnt/bin/NAnt.VisualCppTasks.dll.mdb
+share/NAnt/bin/NAnt.VisualCppTasks.xml
+share/NAnt/bin/NAnt.Win32Tasks.dll
+share/NAnt/bin/NAnt.Win32Tasks.dll.mdb
+share/NAnt/bin/NAnt.Win32Tasks.xml
+share/NAnt/bin/NAnt.exe
+share/NAnt/bin/NAnt.exe.config
+share/NAnt/bin/NAnt.exe.mdb
+share/NAnt/bin/NAnt.xml
+share/NAnt/bin/extensions/
+share/NAnt/bin/extensions/common/
+share/NAnt/bin/extensions/common/2.0/
+share/NAnt/bin/extensions/common/2.0/NAnt.MSBuild.dll
+share/NAnt/bin/extensions/common/2.0/NAnt.MSBuild.dll.mdb
+share/NAnt/bin/extensions/common/2.0/NAnt.MSBuild.xml
+share/NAnt/bin/lib/
+share/NAnt/bin/lib/common/
+share/NAnt/bin/lib/common/neutral/
+share/NAnt/bin/lib/common/neutral/ICSharpCode.SharpCvsLib.Console.dll
+share/NAnt/bin/lib/common/neutral/ICSharpCode.SharpCvsLib.dll
+share/NAnt/bin/lib/common/neutral/ICSharpCode.SharpZipLib.dll
+share/NAnt/bin/lib/common/neutral/NUnitCore.dll
+share/NAnt/bin/lib/mono/
+share/NAnt/bin/lib/mono/1.0/
+share/NAnt/bin/lib/mono/1.0/NDoc.Core.dll
+share/NAnt/bin/lib/mono/1.0/NDoc.Documenter.Msdn.dll
+share/NAnt/bin/lib/mono/1.0/NDoc.ExtendedUI.dll
+share/NAnt/bin/lib/mono/1.0/nunit.core.dll
+share/NAnt/bin/lib/mono/1.0/nunit.framework.dll
+share/NAnt/bin/lib/mono/1.0/nunit.util.dll
+share/NAnt/bin/lib/mono/2.0/
+share/NAnt/bin/lib/mono/2.0/NDoc.Core.dll
+share/NAnt/bin/lib/mono/2.0/NDoc.Documenter.Msdn.dll
+share/NAnt/bin/lib/mono/2.0/NDoc.ExtendedUI.dll
+share/NAnt/bin/lib/mono/2.0/nunit.core.dll
+share/NAnt/bin/lib/mono/2.0/nunit.framework.dll
+share/NAnt/bin/lib/mono/2.0/nunit.util.dll
+share/NAnt/bin/lib/net/
+share/NAnt/bin/lib/net/1.0/
+share/NAnt/bin/lib/net/1.0/NDoc.Core.dll
+share/NAnt/bin/lib/net/1.0/NDoc.Documenter.Msdn.dll
+share/NAnt/bin/lib/net/1.0/NDoc.ExtendedUI.dll
+share/NAnt/bin/lib/net/1.0/nunit.core.dll
+share/NAnt/bin/lib/net/1.0/nunit.framework.dll
+share/NAnt/bin/lib/net/1.0/nunit.util.dll
+share/NAnt/bin/lib/net/1.1/
+share/NAnt/bin/lib/net/1.1/NDoc.Core.dll
+share/NAnt/bin/lib/net/1.1/NDoc.Documenter.Msdn.dll
+share/NAnt/bin/lib/net/1.1/NDoc.ExtendedUI.dll
+share/NAnt/bin/lib/net/1.1/nunit.core.dll
+share/NAnt/bin/lib/net/1.1/nunit.framework.dll
+share/NAnt/bin/lib/net/1.1/nunit.util.dll
+share/NAnt/bin/lib/net/2.0/
+share/NAnt/bin/lib/net/2.0/NDoc.Core.dll
+share/NAnt/bin/lib/net/2.0/NDoc.Documenter.Msdn.dll
+share/NAnt/bin/lib/net/2.0/NDoc.ExtendedUI.dll
+share/NAnt/bin/lib/net/2.0/nunit.core.dll
+share/NAnt/bin/lib/net/2.0/nunit.framework.dll
+share/NAnt/bin/lib/net/2.0/nunit.util.dll
+share/NAnt/bin/log4net.dll
+share/NAnt/bin/scvs.exe