diff --git a/www/horde/chora/Makefile b/www/horde/chora/Makefile
new file mode 100644
index 00000000000..2fd854e5d9d
--- /dev/null
+++ b/www/horde/chora/Makefile
@@ -0,0 +1,12 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2010/08/18 15:04:05 sthen Exp $ 
+
+COMMENT=	web-based CVS viewer module for Horde
+
+HORDE_NAME=	Chora
+
+# GPLv2
+DISTNAME=	chora-h3-2.1.1
+PKGNAME=	${DISTNAME:S/-h3//}
+CATEGORIES=	devel
+
+.include <bsd.port.mk>
diff --git a/www/horde/chora/distinfo b/www/horde/chora/distinfo
new file mode 100644
index 00000000000..8f3a7356b96
--- /dev/null
+++ b/www/horde/chora/distinfo
@@ -0,0 +1,5 @@
+MD5 (chora-h3-2.1.1.tar.gz) = t37J58cDw0/7zEbOqofhMg==
+RMD160 (chora-h3-2.1.1.tar.gz) = VI31tzMxAxp2YxnVjIsBFITh9n0=
+SHA1 (chora-h3-2.1.1.tar.gz) = /afQgN/R6I/MNaHXzHoEOysePtI=
+SHA256 (chora-h3-2.1.1.tar.gz) = 8a9BedfgPpv5/DLKjnmo/g27FZWpeN3JqfdCYueiE+Q=
+SIZE (chora-h3-2.1.1.tar.gz) = 1028264
diff --git a/www/horde/chora/files/copywithlibs.sh b/www/horde/chora/files/copywithlibs.sh
new file mode 100644
index 00000000000..4ca4404cfc8
--- /dev/null
+++ b/www/horde/chora/files/copywithlibs.sh
@@ -0,0 +1,77 @@
+#!/bin/sh -e
+# Copy an executable file/s, complete with libraries, into a chroot jail.
+#
+# $OpenBSD: copywithlibs.sh,v 1.1.1.1 2010/08/18 15:04:05 sthen Exp $
+# Copyright (c) 2010 Stuart Henderson <sthen@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+MYNAME=`basename $0`
+DEST=/var/www
+
+copy_to() {
+	local _to=$1
+	while [ -n "$2" ]; do
+		shift
+		if ! diff $1 ${_to} > /dev/null 2>&1; then
+			echo copying $1
+			install -C $1 ${_to}
+		fi
+	done
+}
+
+copy_with_libs() {
+	local _file="$1"
+	local _lddmsg
+	local _libs
+	local _static
+
+	if ! _lddmsg=`ldd "${_file}" 2>&1`; then
+		# allow static binaries to be copied, bail for other errors
+		if ! echo ${_lddmsg} |
+		    fgrep 'not a dynamic executable' > /dev/null; then
+			echo $MYNAME: ${_lddmsg}
+			return
+		fi
+	fi
+
+	copy_to ${DEST}/usr/bin ${_file}
+
+	_libs=`ldd "${_file}" 2>/dev/null |
+	    awk '/\/usr(\/local)?\/lib\/.*\.so\./ { print $7; }'`
+
+	[ -n "${_libs}" ] && copy_to ${DEST}/usr/lib ${_libs}
+}
+
+if [ -z "$1" ]; then
+	echo usage: $MYNAME /path/to/program
+	exit 1
+fi
+
+if [ ! -d "${DEST}" ]; then
+	echo $MYNAME: ${DEST} not a directory
+	exit 1
+fi
+
+if [ ! -w "${DEST}" ]; then
+	echo $MYNAME: ${DEST} not writable
+	exit 1
+fi
+
+install -d ${DEST}/usr/bin ${DEST}/usr/lib ${DEST}/usr/libexec
+install -C /usr/libexec/ld.so ${DEST}/usr/libexec
+
+while [ -n "$1" ]; do
+	copy_with_libs $1
+	shift
+done
diff --git a/www/horde/chora/pkg/DESCR b/www/horde/chora/pkg/DESCR
new file mode 100644
index 00000000000..fcc5de9695b
--- /dev/null
+++ b/www/horde/chora/pkg/DESCR
@@ -0,0 +1,16 @@
+Chora is a tool for viewing code repositories that are managed
+using the CVS or Subversion source control systems. It aims to
+provide a high degree of integration with CVS, SVN and the other
+Horde web-based tools.
+
+To complete the installation, be sure that Horde is configured and
+working first, then see ${PREFIX}/${INSTDIR}/docs/INSTALL
+
+If using the default OpenBSD configuration of httpd, you will need to
+copy tools and libraries into the chroot jail. The following are enough
+for cvs; see "Paths and Locations" in Chora's setup menu for optional
+extras and other version control systems.
+
+# mkdir -p /var/www/bin; cp /bin/sh /var/www/bin
+# cd /usr/bin; sh /var/www/horde/chora/copywithlibs.sh \
+    ci co rcs rcsdiff rlog cvs diff
diff --git a/www/horde/chora/pkg/PLIST b/www/horde/chora/pkg/PLIST
new file mode 100644
index 00000000000..2f21b924cc6
--- /dev/null
+++ b/www/horde/chora/pkg/PLIST
@@ -0,0 +1,213 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2010/08/18 15:04:05 sthen Exp $
+@pkgpath devel/chora
+${INSTDIR}/
+${INSTDIR}/COPYING
+${INSTDIR}/README
+${INSTDIR}/annotate.php
+${INSTDIR}/browse.php
+${INSTDIR}/co.php
+@mode 700
+@owner www
+@group www
+${INSTDIR}/config/
+@mode 600
+${INSTDIR}/config/.htaccess
+${INSTDIR}/config/conf.xml
+${INSTDIR}/config/cvsgraph.conf.dist
+@sample horde/${HORDE_MODULE}/config/cvsgraph.conf
+${INSTDIR}/config/longIntro.txt.dist
+@sample horde/${HORDE_MODULE}/config/longIntro.txt
+${INSTDIR}/config/mime_drivers.php.dist
+@sample horde/${HORDE_MODULE}/config/mime_drivers.php
+${INSTDIR}/config/prefs.php.dist
+@sample horde/${HORDE_MODULE}/config/prefs.php
+${INSTDIR}/config/sourceroots.php.dist
+@sample horde/${HORDE_MODULE}/config/sourceroots.php
+@mode
+@owner
+@group
+${INSTDIR}/cvs.php
+${INSTDIR}/cvsgraph.php
+${INSTDIR}/diff.php
+${INSTDIR}/docs/
+${INSTDIR}/docs/BUGS
+${INSTDIR}/docs/CHANGES
+${INSTDIR}/docs/CREDITS
+${INSTDIR}/docs/INSTALL
+${INSTDIR}/docs/RELEASE_NOTES
+${INSTDIR}/docs/TODO
+${INSTDIR}/history.php
+${INSTDIR}/index.php
+${INSTDIR}/js/
+${INSTDIR}/js/QuickFinder.js
+${INSTDIR}/js/prototype.js
+${INSTDIR}/js/revlog.js
+${INSTDIR}/js/src/
+${INSTDIR}/js/src/QuickFinder.js
+${INSTDIR}/js/src/prototype.js
+${INSTDIR}/js/src/revlog.js
+${INSTDIR}/js/src/stripe.js
+${INSTDIR}/js/src/tables.js
+${INSTDIR}/js/stripe.js
+${INSTDIR}/js/tables.js
+${INSTDIR}/lib/
+${INSTDIR}/lib/.htaccess
+${INSTDIR}/lib/Block/
+${INSTDIR}/lib/Block/tree_menu.php
+${INSTDIR}/lib/${HORDE_NAME}.php
+${INSTDIR}/lib/api.php
+${INSTDIR}/lib/base.php
+${INSTDIR}/lib/version.php
+${INSTDIR}/locale/
+${INSTDIR}/locale/.htaccess
+${INSTDIR}/locale/cs_CZ/
+${INSTDIR}/locale/cs_CZ/LC_MESSAGES/
+${INSTDIR}/locale/cs_CZ/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/da_DK/
+${INSTDIR}/locale/da_DK/LC_MESSAGES/
+${INSTDIR}/locale/da_DK/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/de_DE/
+${INSTDIR}/locale/de_DE/LC_MESSAGES/
+${INSTDIR}/locale/de_DE/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/de_DE/help.xml
+${INSTDIR}/locale/en_US/
+${INSTDIR}/locale/en_US/help.xml
+${INSTDIR}/locale/es_ES/
+${INSTDIR}/locale/es_ES/LC_MESSAGES/
+${INSTDIR}/locale/es_ES/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/es_ES/help.xml
+${INSTDIR}/locale/fi_FI/
+${INSTDIR}/locale/fi_FI/LC_MESSAGES/
+${INSTDIR}/locale/fi_FI/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/fi_FI/help.xml
+${INSTDIR}/locale/fr_FR/
+${INSTDIR}/locale/fr_FR/LC_MESSAGES/
+${INSTDIR}/locale/fr_FR/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/it_IT/
+${INSTDIR}/locale/it_IT/LC_MESSAGES/
+${INSTDIR}/locale/it_IT/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/nb_NO/
+${INSTDIR}/locale/nb_NO/LC_MESSAGES/
+${INSTDIR}/locale/nb_NO/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/nl_NL/
+${INSTDIR}/locale/nl_NL/LC_MESSAGES/
+${INSTDIR}/locale/nl_NL/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/pl_PL/
+${INSTDIR}/locale/pl_PL/LC_MESSAGES/
+${INSTDIR}/locale/pl_PL/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/pt_BR/
+${INSTDIR}/locale/pt_BR/LC_MESSAGES/
+${INSTDIR}/locale/pt_BR/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/ro_RO/
+${INSTDIR}/locale/ro_RO/LC_MESSAGES/
+${INSTDIR}/locale/ro_RO/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/ru_RU/
+${INSTDIR}/locale/ru_RU/LC_MESSAGES/
+${INSTDIR}/locale/ru_RU/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/sk_SK/
+${INSTDIR}/locale/sk_SK/LC_MESSAGES/
+${INSTDIR}/locale/sk_SK/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/sv_SE/
+${INSTDIR}/locale/sv_SE/LC_MESSAGES/
+${INSTDIR}/locale/sv_SE/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/zh_CN/
+${INSTDIR}/locale/zh_CN/LC_MESSAGES/
+${INSTDIR}/locale/zh_CN/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/locale/zh_TW/
+${INSTDIR}/locale/zh_TW/LC_MESSAGES/
+${INSTDIR}/locale/zh_TW/LC_MESSAGES/${HORDE_MODULE}.mo
+${INSTDIR}/patchsets.php
+${INSTDIR}/po/
+${INSTDIR}/po/.htaccess
+${INSTDIR}/po/README
+${INSTDIR}/po/${HORDE_MODULE}.pot
+${INSTDIR}/po/cs_CZ.po
+${INSTDIR}/po/da_DK.po
+${INSTDIR}/po/de_DE.po
+${INSTDIR}/po/es_ES.po
+${INSTDIR}/po/fi_FI.po
+${INSTDIR}/po/fr_FR.po
+${INSTDIR}/po/it_IT.po
+${INSTDIR}/po/nb_NO.po
+${INSTDIR}/po/nl_NL.po
+${INSTDIR}/po/pl_PL.po
+${INSTDIR}/po/pt_BR.po
+${INSTDIR}/po/ro_RO.po
+${INSTDIR}/po/ru_RU.po
+${INSTDIR}/po/sk_SK.po
+${INSTDIR}/po/sv_SE.po
+${INSTDIR}/po/zh_CN.po
+${INSTDIR}/po/zh_TW.po
+${INSTDIR}/stats.php
+${INSTDIR}/templates/
+${INSTDIR}/templates/.htaccess
+${INSTDIR}/templates/annotate/
+${INSTDIR}/templates/annotate/footer.inc
+${INSTDIR}/templates/annotate/header.inc
+${INSTDIR}/templates/annotate/line.inc
+${INSTDIR}/templates/checkout/
+${INSTDIR}/templates/checkout/checkout.inc
+${INSTDIR}/templates/common-header.inc
+${INSTDIR}/templates/cvsgraph/
+${INSTDIR}/templates/cvsgraph/cvsgraph.inc
+${INSTDIR}/templates/diff/
+${INSTDIR}/templates/diff/hr/
+${INSTDIR}/templates/diff/hr/add.inc
+${INSTDIR}/templates/diff/hr/change.inc
+${INSTDIR}/templates/diff/hr/empty.inc
+${INSTDIR}/templates/diff/hr/footer.inc
+${INSTDIR}/templates/diff/hr/header.inc
+${INSTDIR}/templates/diff/hr/nochange.inc
+${INSTDIR}/templates/diff/hr/remove.inc
+${INSTDIR}/templates/diff/hr/row.inc
+${INSTDIR}/templates/directory/
+${INSTDIR}/templates/directory/back.inc
+${INSTDIR}/templates/directory/dir.inc
+${INSTDIR}/templates/directory/file.inc
+${INSTDIR}/templates/directory/header.inc
+${INSTDIR}/templates/error_page.inc
+${INSTDIR}/templates/headerbar.inc
+${INSTDIR}/templates/history/
+${INSTDIR}/templates/history/blank.inc
+${INSTDIR}/templates/history/branch_cell.inc
+${INSTDIR}/templates/history/footer.inc
+${INSTDIR}/templates/history/header.inc
+${INSTDIR}/templates/history/rev.inc
+${INSTDIR}/templates/log/
+${INSTDIR}/templates/log/footer.inc
+${INSTDIR}/templates/log/header.inc
+${INSTDIR}/templates/log/rev.inc
+${INSTDIR}/templates/menu.inc
+${INSTDIR}/templates/patchsets/
+${INSTDIR}/templates/patchsets/footer.inc
+${INSTDIR}/templates/patchsets/header.inc
+${INSTDIR}/templates/patchsets/ps.inc
+${INSTDIR}/templates/stats/
+${INSTDIR}/templates/stats/stats.inc
+${INSTDIR}/test.php
+${INSTDIR}/themes/
+${INSTDIR}/themes/burntorange/
+${INSTDIR}/themes/burntorange/screen.css
+${INSTDIR}/themes/graphics/
+${INSTDIR}/themes/graphics/az.png
+${INSTDIR}/themes/graphics/back.png
+${INSTDIR}/themes/graphics/${HORDE_MODULE}.png
+${INSTDIR}/themes/graphics/deleted.png
+${INSTDIR}/themes/graphics/diff.png
+${INSTDIR}/themes/graphics/favicon.ico
+${INSTDIR}/themes/graphics/folder.png
+${INSTDIR}/themes/graphics/za.png
+${INSTDIR}/themes/hordeweb/
+${INSTDIR}/themes/hordeweb/screen.css
+${INSTDIR}/themes/screen.css
+${INSTDIR}/themes/silver/
+${INSTDIR}/themes/silver/graphics/
+${INSTDIR}/themes/silver/graphics/az.png
+${INSTDIR}/themes/silver/graphics/back.png
+${INSTDIR}/themes/silver/graphics/${HORDE_MODULE}.png
+${INSTDIR}/themes/silver/graphics/deleted.png
+${INSTDIR}/themes/silver/graphics/diff.png
+${INSTDIR}/themes/silver/graphics/favicon.ico
+${INSTDIR}/themes/silver/graphics/folder.png
+${INSTDIR}/themes/silver/graphics/za.png
+${INSTDIR}/themes/silver/themed_graphics