diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile
new file mode 100644
index 00000000000..ed5ac1d89ff
--- /dev/null
+++ b/www/mono-xsp/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD
+
+COMMENT=	ASP.NET implementations for Mono
+
+V=		2.10.2
+DISTNAME=	xsp-${V}
+PKGNAME=	mono-xsp-${V}
+
+EXTRACT_SUFX=	.tar.bz2
+
+CATEGORIES=	www devel
+
+HOMEPAGE=	http://www.mono-project.com/ASP.NET
+MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/xsp/
+
+MAINTAINER=	Robet Nagy <robert@openbsd.org>
+
+# MIT
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MODULES=	lang/mono
+
+BUILD_DEPENDS+=	misc/findutils
+
+CONFIGURE_STYLE=gnu
+
+USE_GMAKE=	Yes
+
+.include <bsd.port.mk>
diff --git a/www/mono-xsp/distinfo b/www/mono-xsp/distinfo
new file mode 100644
index 00000000000..7e7fd1df29a
--- /dev/null
+++ b/www/mono-xsp/distinfo
@@ -0,0 +1,5 @@
+MD5 (xsp-2.10.2.tar.bz2) = T+YvyVrV3BNtin8ymdUjtg==
+RMD160 (xsp-2.10.2.tar.bz2) = nRCXs9hB9IdkSA0UTciv8LgBHOI=
+SHA1 (xsp-2.10.2.tar.bz2) = yrkhjFa7n24ajo5Ww7l6wurCe+w=
+SHA256 (xsp-2.10.2.tar.bz2) = 9GV/ckFnJE2brt+U4dV0e48fU8M5x6EYlxVMHrEonU4=
+SIZE (xsp-2.10.2.tar.bz2) = 284801
diff --git a/www/mono-xsp/patches/patch-docs_Mono_FastCGI_Makefile_in b/www/mono-xsp/patches/patch-docs_Mono_FastCGI_Makefile_in
new file mode 100644
index 00000000000..b53f7020901
--- /dev/null
+++ b/www/mono-xsp/patches/patch-docs_Mono_FastCGI_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-docs_Mono_FastCGI_Makefile_in,v 1.1.1.1 2011/07/20 14:53:24 robert Exp $
+--- docs/Mono.FastCGI/Makefile.in.orig	Wed Jul 20 16:28:20 2011
++++ docs/Mono.FastCGI/Makefile.in	Wed Jul 20 16:28:23 2011
+@@ -170,7 +170,7 @@ DOCS_TREE_20 = $(DOCS_ARCHIVE_BASE).tree
+ DOCS_SOURCE_20 = $(DOCS_ARCHIVE_BASE).source
+ MONO_FASTCGI_ASSEMBLY_20 = $(top_srcdir)/src/Mono.WebServer.FastCgi/fastcgi-mono-server2.exe
+ INSTALL_FILES = $(DOCS_ARCHIVE_20) $(DOCS_TREE_20) $(DOCS_SOURCE_20)
+-DOC_FILES = $(shell find en -path '*/.svn' -prune -o -type f -printf "%p ")
++DOC_FILES = $(shell gfind en -path '*/.svn' -prune -o -type f -printf "%p ")
+ EXTRA_DIST = \
+ 	$(DOCS_SOURCE_20) \
+ 	$(DOC_FILES)
diff --git a/www/mono-xsp/patches/patch-docs_Mono_WebServer_Makefile_in b/www/mono-xsp/patches/patch-docs_Mono_WebServer_Makefile_in
new file mode 100644
index 00000000000..bcbd9bd1a3f
--- /dev/null
+++ b/www/mono-xsp/patches/patch-docs_Mono_WebServer_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-docs_Mono_WebServer_Makefile_in,v 1.1.1.1 2011/07/20 14:53:24 robert Exp $
+--- docs/Mono.WebServer/Makefile.in.orig	Wed Jul 20 16:28:03 2011
++++ docs/Mono.WebServer/Makefile.in	Wed Jul 20 16:28:15 2011
+@@ -170,7 +170,7 @@ DOCS_TREE_20 = $(DOCS_ARCHIVE_BASE).tree
+ DOCS_SOURCE_20 = $(DOCS_ARCHIVE_BASE).source
+ MONO_WEBSERVER_ASSEMBLY_20 = $(top_srcdir)/src/Mono.WebServer/2.0/Mono.WebServer2.dll
+ INSTALL_FILES = $(DOCS_ARCHIVE_20) $(DOCS_TREE_20) $(DOCS_SOURCE_20)
+-DOC_FILES = $(shell find en -path '*/.svn' -prune -o -type f -printf "%p ")
++DOC_FILES = $(shell gfind en -path '*/.svn' -prune -o -type f -printf "%p ")
+ EXTRA_DIST = \
+ 	$(DOCS_SOURCE_20) \
+ 	$(DOC_FILES)
diff --git a/www/mono-xsp/patches/patch-src_Mono_WebServer_FastCgi_ConfigurationManager_xml b/www/mono-xsp/patches/patch-src_Mono_WebServer_FastCgi_ConfigurationManager_xml
new file mode 100644
index 00000000000..c773843008a
--- /dev/null
+++ b/www/mono-xsp/patches/patch-src_Mono_WebServer_FastCgi_ConfigurationManager_xml
@@ -0,0 +1,19 @@
+$OpenBSD: patch-src_Mono_WebServer_FastCgi_ConfigurationManager_xml,v 1.1.1.1 2011/07/20 14:53:24 robert Exp $
+--- src/Mono.WebServer.FastCgi/ConfigurationManager.xml.orig	Wed Jul 20 16:33:50 2011
++++ src/Mono.WebServer.FastCgi/ConfigurationManager.xml	Wed Jul 20 16:33:54 2011
+@@ -42,7 +42,7 @@
+ 	<!-- SOCKET SETTINGS -->
+ 	
+ 	<Setting Name="socket" Type="String" AppSetting="MonoSocketType"
+-		Environment="MONO_FCGI_SOCKET" ConsoleVisible="True" Value="pipe">
++		Environment="MONO_FCGI_SOCKET" ConsoleVisible="True" Value="unix">
+ 		<Description>
+ 			<para>Specifies the type of socket to listen on. Valid
+ 			values are "pipe", "unix", and "tcp".</para>
+@@ -255,4 +255,4 @@
+ 			<para>Prints log messages to the console.</para>
+ 		</Description>
+ 	</Setting>
+-</ConfigurationManager>
+\ No newline at end of file
++</ConfigurationManager>
diff --git a/www/mono-xsp/pkg/DESCR b/www/mono-xsp/pkg/DESCR
new file mode 100644
index 00000000000..d9490d19385
--- /dev/null
+++ b/www/mono-xsp/pkg/DESCR
@@ -0,0 +1,2 @@
+The XSP is a Mono based web server that can be used to run ASP.NET
+applications.
diff --git a/www/mono-xsp/pkg/PLIST b/www/mono-xsp/pkg/PLIST
new file mode 100644
index 00000000000..0c671c48938
--- /dev/null
+++ b/www/mono-xsp/pkg/PLIST
@@ -0,0 +1,256 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2011/07/20 14:53:24 robert Exp $
+bin/asp-state
+bin/asp-state2
+bin/asp-state4
+bin/dbsessmgr
+bin/dbsessmgr2
+bin/dbsessmgr4
+bin/fastcgi-mono-server
+bin/fastcgi-mono-server2
+bin/fastcgi-mono-server4
+bin/mod-mono-server
+bin/mod-mono-server2
+bin/mod-mono-server4
+bin/xsp
+bin/xsp2
+bin/xsp4
+lib/mono/2.0/Mono.WebServer2.dll
+lib/mono/2.0/fastcgi-mono-server2.exe
+lib/mono/2.0/mod-mono-server2.exe
+lib/mono/2.0/xsp2.exe
+lib/mono/4.0/Mono.WebServer2.dll
+lib/mono/4.0/fastcgi-mono-server4.exe
+lib/mono/4.0/mod-mono-server4.exe
+lib/mono/4.0/xsp4.exe
+lib/mono/gac/Mono.WebServer2/
+lib/mono/gac/Mono.WebServer2/0.2.0.0__0738eb9f132ed756/
+lib/mono/gac/Mono.WebServer2/0.2.0.0__0738eb9f132ed756/Mono.WebServer2.dll
+lib/mono/gac/Mono.WebServer2/0.2.0.0__0738eb9f132ed756/Mono.WebServer2.dll.mdb
+lib/mono/gac/Mono.WebServer2/0.4.0.0__0738eb9f132ed756/
+lib/mono/gac/Mono.WebServer2/0.4.0.0__0738eb9f132ed756/Mono.WebServer2.dll
+lib/mono/gac/Mono.WebServer2/0.4.0.0__0738eb9f132ed756/Mono.WebServer2.dll.mdb
+lib/mono/gac/fastcgi-mono-server2/
+lib/mono/gac/fastcgi-mono-server2/2.10.2.0__0738eb9f132ed756/
+lib/mono/gac/fastcgi-mono-server2/2.10.2.0__0738eb9f132ed756/fastcgi-mono-server2.exe
+lib/mono/gac/fastcgi-mono-server2/2.10.2.0__0738eb9f132ed756/fastcgi-mono-server2.exe.mdb
+lib/mono/gac/fastcgi-mono-server4/
+lib/mono/gac/fastcgi-mono-server4/2.10.2.0__0738eb9f132ed756/
+lib/mono/gac/fastcgi-mono-server4/2.10.2.0__0738eb9f132ed756/fastcgi-mono-server4.exe
+lib/mono/gac/fastcgi-mono-server4/2.10.2.0__0738eb9f132ed756/fastcgi-mono-server4.exe.mdb
+lib/mono/gac/mod-mono-server2/
+lib/mono/gac/mod-mono-server2/2.10.2.0__0738eb9f132ed756/
+lib/mono/gac/mod-mono-server2/2.10.2.0__0738eb9f132ed756/mod-mono-server2.exe
+lib/mono/gac/mod-mono-server2/2.10.2.0__0738eb9f132ed756/mod-mono-server2.exe.mdb
+lib/mono/gac/mod-mono-server4/
+lib/mono/gac/mod-mono-server4/2.10.2.0__0738eb9f132ed756/
+lib/mono/gac/mod-mono-server4/2.10.2.0__0738eb9f132ed756/mod-mono-server4.exe
+lib/mono/gac/mod-mono-server4/2.10.2.0__0738eb9f132ed756/mod-mono-server4.exe.mdb
+lib/mono/gac/xsp2/
+lib/mono/gac/xsp2/2.10.2.0__0738eb9f132ed756/
+lib/mono/gac/xsp2/2.10.2.0__0738eb9f132ed756/xsp2.exe
+lib/mono/gac/xsp2/2.10.2.0__0738eb9f132ed756/xsp2.exe.mdb
+lib/mono/gac/xsp4/
+lib/mono/gac/xsp4/2.10.2.0__0738eb9f132ed756/
+lib/mono/gac/xsp4/2.10.2.0__0738eb9f132ed756/xsp4.exe
+lib/mono/gac/xsp4/2.10.2.0__0738eb9f132ed756/xsp4.exe.mdb
+lib/monodoc/sources/Mono.FastCGI.source
+lib/monodoc/sources/Mono.FastCGI.tree
+lib/monodoc/sources/Mono.FastCGI.zip
+lib/monodoc/sources/Mono.WebServer.source
+lib/monodoc/sources/Mono.WebServer.tree
+lib/monodoc/sources/Mono.WebServer.zip
+lib/pkgconfig/xsp-2.pc
+lib/pkgconfig/xsp-4.pc
+lib/xsp/
+lib/xsp/2.0/
+lib/xsp/2.0/asp-state2.exe
+lib/xsp/2.0/asp-state2.exe.config
+lib/xsp/2.0/dbsessmgr2.exe
+lib/xsp/2.0/dbsessmgr2.exe.config
+lib/xsp/4.0/
+lib/xsp/4.0/asp-state4.exe
+lib/xsp/4.0/asp-state4.exe.config
+lib/xsp/4.0/dbsessmgr4.exe
+lib/xsp/4.0/dbsessmgr4.exe.config
+lib/xsp/test/
+lib/xsp/test/1.1/
+lib/xsp/test/1.1/asp.net/
+lib/xsp/test/1.1/asp.net/body.inc
+lib/xsp/test/1.1/asp.net/browsercaps.aspx
+lib/xsp/test/1.1/asp.net/code-render.aspx
+lib/xsp/test/1.1/asp.net/codebehind1.aspx
+lib/xsp/test/1.1/asp.net/header.inc
+lib/xsp/test/1.1/asp.net/includetest.aspx
+lib/xsp/test/1.1/asp.net/index.aspx
+lib/xsp/test/1.1/asp.net/registertest.aspx
+lib/xsp/test/1.1/asp.net/registertest1.ascx
+lib/xsp/test/1.1/asp.net/registertest2.ascx
+lib/xsp/test/1.1/asp.net/serial.aspx
+lib/xsp/test/1.1/asp.net/server-side-object.aspx
+lib/xsp/test/1.1/asp.net/session1.aspx
+lib/xsp/test/1.1/asp.net/transfer1.aspx
+lib/xsp/test/1.1/asp.net/transfer2.aspx
+lib/xsp/test/1.1/asp.net/typedesc.aspx
+lib/xsp/test/1.1/authtest/
+lib/xsp/test/1.1/authtest/index.aspx
+lib/xsp/test/1.1/authtest/login.aspx
+lib/xsp/test/1.1/authtest/web.config
+lib/xsp/test/1.1/customcontrol/
+lib/xsp/test/1.1/customcontrol/index.aspx
+lib/xsp/test/1.1/customcontrol/tabcontrol.aspx
+lib/xsp/test/1.1/customcontrol/tabcontrol2.aspx
+lib/xsp/test/1.1/databind/
+lib/xsp/test/1.1/databind/databind-arraylist.aspx
+lib/xsp/test/1.1/databind/databind-attribute.aspx
+lib/xsp/test/1.1/databind/databind-class.aspx
+lib/xsp/test/1.1/databind/databind-template.aspx
+lib/xsp/test/1.1/databind/index.aspx
+lib/xsp/test/1.1/handlers/
+lib/xsp/test/1.1/handlers/async.ashx
+lib/xsp/test/1.1/handlers/chunked.ashx
+lib/xsp/test/1.1/handlers/empty.ashx
+lib/xsp/test/1.1/handlers/index.aspx
+lib/xsp/test/1.1/handlers/monodoc.ashx
+lib/xsp/test/1.1/handlers/webhandler.ashx
+lib/xsp/test/1.1/html/
+lib/xsp/test/1.1/html/button.aspx
+lib/xsp/test/1.1/html/htmlanchor.aspx
+lib/xsp/test/1.1/html/htmlbutton.aspx
+lib/xsp/test/1.1/html/htmlgeneric.aspx
+lib/xsp/test/1.1/html/htmlimage.aspx
+lib/xsp/test/1.1/html/htmlinputbutton.aspx
+lib/xsp/test/1.1/html/htmlinputcheckbox.aspx
+lib/xsp/test/1.1/html/htmlinputfile.aspx
+lib/xsp/test/1.1/html/htmlinputhidden.aspx
+lib/xsp/test/1.1/html/htmlinputimage.aspx
+lib/xsp/test/1.1/html/htmlinputradiobutton.aspx
+lib/xsp/test/1.1/html/htmlinputtext.aspx
+lib/xsp/test/1.1/html/htmlselect.aspx
+lib/xsp/test/1.1/html/htmltable.aspx
+lib/xsp/test/1.1/html/htmltextarea.aspx
+lib/xsp/test/1.1/html/index.aspx
+lib/xsp/test/1.1/index.aspx
+lib/xsp/test/1.1/webcontrols/
+lib/xsp/test/1.1/webcontrols/calendar.aspx
+lib/xsp/test/1.1/webcontrols/datalist.aspx
+lib/xsp/test/1.1/webcontrols/dbpage1.aspx
+lib/xsp/test/1.1/webcontrols/dbpage1.sqlite
+lib/xsp/test/1.1/webcontrols/dbpage2.aspx
+lib/xsp/test/1.1/webcontrols/dbpage2.sqlite
+lib/xsp/test/1.1/webcontrols/dbpage_test_setup.exe
+lib/xsp/test/1.1/webcontrols/index.aspx
+lib/xsp/test/1.1/webcontrols/listitem.aspx
+lib/xsp/test/1.1/webcontrols/people.xml
+lib/xsp/test/1.1/webcontrols/peopletable.xsl
+lib/xsp/test/1.1/webcontrols/temperature.aspx
+lib/xsp/test/1.1/webcontrols/validator1.aspx
+lib/xsp/test/1.1/webcontrols/web_adrotator.aspx
+lib/xsp/test/1.1/webcontrols/web_adrotator.xml
+lib/xsp/test/1.1/webcontrols/web_button.aspx
+lib/xsp/test/1.1/webcontrols/web_checkbox.aspx
+lib/xsp/test/1.1/webcontrols/web_checkboxlist.aspx
+lib/xsp/test/1.1/webcontrols/web_comparevalidator.aspx
+lib/xsp/test/1.1/webcontrols/web_datagrid.aspx
+lib/xsp/test/1.1/webcontrols/web_datagrid_command.aspx
+lib/xsp/test/1.1/webcontrols/web_dropdownlist.aspx
+lib/xsp/test/1.1/webcontrols/web_hyperlink.aspx
+lib/xsp/test/1.1/webcontrols/web_image.aspx
+lib/xsp/test/1.1/webcontrols/web_imagebutton.aspx
+lib/xsp/test/1.1/webcontrols/web_label.aspx
+lib/xsp/test/1.1/webcontrols/web_linkbutton.aspx
+lib/xsp/test/1.1/webcontrols/web_listbox.aspx
+lib/xsp/test/1.1/webcontrols/web_literal.aspx
+lib/xsp/test/1.1/webcontrols/web_panel.aspx
+lib/xsp/test/1.1/webcontrols/web_placeholder.aspx
+lib/xsp/test/1.1/webcontrols/web_radiobutton.aspx
+lib/xsp/test/1.1/webcontrols/web_radiobuttonlist.aspx
+lib/xsp/test/1.1/webcontrols/web_regularexpressionvalidator.aspx
+lib/xsp/test/1.1/webcontrols/web_repeater.aspx
+lib/xsp/test/1.1/webcontrols/web_table.aspx
+lib/xsp/test/1.1/webcontrols/web_table2.aspx
+lib/xsp/test/1.1/webcontrols/web_textbox.aspx
+lib/xsp/test/1.1/webcontrols/web_xml.aspx
+lib/xsp/test/1.1/webservice/
+lib/xsp/test/1.1/webservice/CompressExtension.cs
+lib/xsp/test/1.1/webservice/ConverterService.asmx
+lib/xsp/test/1.1/webservice/ServiceClient.exe.config
+lib/xsp/test/1.1/webservice/TestService.asmx
+lib/xsp/test/1.1/webservice/index.aspx
+lib/xsp/test/2.0/
+lib/xsp/test/2.0/gridview/
+lib/xsp/test/2.0/gridview/BasicGrid.aspx
+lib/xsp/test/2.0/gridview/ObjectBoundGrid.aspx
+lib/xsp/test/2.0/gridview/data.xml
+lib/xsp/test/2.0/gridview/index.aspx
+lib/xsp/test/2.0/index.aspx
+lib/xsp/test/2.0/masterpages/
+lib/xsp/test/2.0/masterpages/content1.aspx
+lib/xsp/test/2.0/masterpages/content2.aspx
+lib/xsp/test/2.0/masterpages/frame.master
+lib/xsp/test/2.0/masterpages/index.aspx
+lib/xsp/test/2.0/masterpages/simple.aspx
+lib/xsp/test/2.0/masterpages/simple.master
+lib/xsp/test/2.0/menu/
+lib/xsp/test/2.0/menu/index.aspx
+lib/xsp/test/2.0/menu/menu1.aspx
+lib/xsp/test/2.0/menu/menu2.aspx
+lib/xsp/test/2.0/menu/stock_copy_24.png
+lib/xsp/test/2.0/menu/stock_cut_24.png
+lib/xsp/test/2.0/menu/stock_paste_24.png
+lib/xsp/test/2.0/treeview/
+lib/xsp/test/2.0/treeview/TreeLineImages/
+lib/xsp/test/2.0/treeview/TreeLineImages/dash.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/dashminus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/dashplus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/i.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/l.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/lminus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/lplus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/minus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/noexpand.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/plus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/r.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/rminus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/rplus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/t.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/tminus.gif
+lib/xsp/test/2.0/treeview/TreeLineImages/tplus.gif
+lib/xsp/test/2.0/treeview/index.aspx
+lib/xsp/test/2.0/treeview/populate-on-demand.aspx
+lib/xsp/test/2.0/treeview/populate.cs
+lib/xsp/test/2.0/treeview/treeview-databound.aspx
+lib/xsp/test/2.0/treeview/treeview.aspx
+lib/xsp/test/App_Code/
+lib/xsp/test/App_Code/Application.cs
+lib/xsp/test/ServiceClient.exe
+lib/xsp/test/Web.sitemap
+lib/xsp/test/bin/
+lib/xsp/test/bin/codebehind1.dll
+lib/xsp/test/bin/extensions.dll
+lib/xsp/test/bin/tabcontrol.dll
+lib/xsp/test/bin/tabcontrol2.dll
+lib/xsp/test/bin/treeview.dll
+lib/xsp/test/bin/typedesc.dll
+lib/xsp/test/controls/
+lib/xsp/test/controls/BreadCrumbs_2.0.ascx
+lib/xsp/test/controls/FileList.ascx
+lib/xsp/test/controls/MonoSamplesHeader.ascx
+lib/xsp/test/extensions.dll
+lib/xsp/test/favicon.ico
+lib/xsp/test/global.asax
+lib/xsp/test/index.aspx
+lib/xsp/test/missing_components.aspx
+lib/xsp/test/mod-mono-server.exe.config
+lib/xsp/test/mono-powered-big.png
+lib/xsp/test/mono-xsp.css
+lib/xsp/test/mono.png
+lib/xsp/test/monobutton.png
+lib/xsp/test/sample.webapp
+lib/xsp/test/small-icon.png
+lib/xsp/test/web.config
+lib/xsp/test/xsp.exe.config
+@man man/man1/asp-state.1
+@man man/man1/dbsessmgr.1
+@man man/man1/fastcgi-mono-server.1
+@man man/man1/mod-mono-server.1
+@man man/man1/xsp.1