diff --git a/databases/Makefile b/databases/Makefile
index 3634a91c4fa4..caf7da3d6cee 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -145,6 +145,7 @@
     SUBDIR += php-sqlrelay
     SUBDIR += phpmyadmin
     SUBDIR += phppgadmin
+    SUBDIR += postgresql-contrib
     SUBDIR += postgresql-devel
     SUBDIR += postgresql-docs
     SUBDIR += postgresql-jdbc
diff --git a/databases/postgresql-contrib/Makefile b/databases/postgresql-contrib/Makefile
new file mode 100644
index 000000000000..dd05c9deacb4
--- /dev/null
+++ b/databases/postgresql-contrib/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	postgresql-contrib
+# Date created:		June 10, 2003
+# Whom:			Palle Girgensohn <girgen@pingpong.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	postgresql-contrib
+PORTREVISION=	0
+CATEGORIES=	databases
+
+MAINTAINER=	girgen@pingpong.net
+COMMENT=	The contrib utilities from the PostgreSQL distribution
+
+LIB_DEPENDS=	pq:${PORTSDIR}/${POSTGRESQL_PORT}
+
+POSTGRESQL_PORT?=	databases/postgresql7
+POSTGRESQL_SUBPORT=YES
+.include <${.CURDIR}/../../${POSTGRESQL_PORT}/Makefile>
+
+INSTALLS_SHLIB=	yes
+
+CONFIGURE_ARGS=	--with-libraries=${LOCALBASE}/lib \
+		--with-includes=${LOCALBASE}/include \
+		--docdir=${PREFIX}/share/doc/postgresql
+MAKE_ARGS=	-C contrib
+
+pre-build:
+	cd ${WRKSRC}/src/backend ;\
+	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
+
+post-install:
+	@ ${INSTALL_DATA} ${WRKSRC}/contrib/README \
+			  ${PREFIX}/share/doc/postgresql/contrib/README
+	@ ${ECHO} ==================================== ;\
+	  ${SED} -e "s,/usr/local,${PREFIX},g"  ${PKGDIR}/pkg-message ;\
+	  ${ECHO} ====================================
+
+.include <bsd.port.mk>
diff --git a/databases/postgresql-contrib/pkg-descr b/databases/postgresql-contrib/pkg-descr
new file mode 100644
index 000000000000..f7a01fd35e15
--- /dev/null
+++ b/databases/postgresql-contrib/pkg-descr
@@ -0,0 +1,23 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree.  This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types.  After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file.  For example,
+
+        $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
+
+WWW: http://www.postgresql.org/
diff --git a/databases/postgresql-contrib/pkg-message b/databases/postgresql-contrib/pkg-message
new file mode 100644
index 000000000000..8120f2d8d89c
--- /dev/null
+++ b/databases/postgresql-contrib/pkg-message
@@ -0,0 +1,3 @@
+The PostgreSQL contrib utilities have been installed. Please see
+/usr/local/share/doc/postgresql/contrib/README
+for more information.
diff --git a/databases/postgresql-contrib/pkg-plist b/databases/postgresql-contrib/pkg-plist
new file mode 100644
index 000000000000..e14fccbad9ee
--- /dev/null
+++ b/databases/postgresql-contrib/pkg-plist
@@ -0,0 +1,135 @@
+bin/ApplySnapshot
+bin/CleanLog
+bin/GetSyncID
+bin/InitRservTest
+bin/MasterAddTable
+bin/MasterInit
+bin/MasterSync
+bin/PrepareSnapshot
+bin/Replicate
+bin/RservTest
+bin/SlaveAddTable
+bin/SlaveInit
+bin/dbf2pg
+bin/findoidjoins
+bin/fti.pl
+bin/make_oidjoins_check
+bin/oid2name
+bin/pg_dumplo
+bin/pg_logger
+bin/pgbench
+bin/vacuumlo
+lib/postgresql/_int.so
+lib/postgresql/array_iterator.so
+lib/postgresql/autoinc.so
+lib/postgresql/btree_gist.so
+lib/postgresql/chkpass.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dbsize.so
+lib/postgresql/earthdistance.so
+lib/postgresql/fti.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/insert_username.so
+lib/postgresql/int_aggregate.so
+lib/postgresql/isbn_issn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/misc_utils.so
+lib/postgresql/moddatetime.so
+lib/postgresql/noup.so
+lib/postgresql/pending.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgstattuple.so
+lib/postgresql/refint.so
+lib/postgresql/rserv.so
+lib/postgresql/rtree_gist.so
+lib/postgresql/seg.so
+lib/postgresql/string_io.so
+lib/postgresql/tablefunc.so
+lib/postgresql/timetravel.so
+lib/postgresql/tsearch.so
+lib/postgresql/user_locks.so
+share/doc/postgresql/contrib/README
+share/doc/postgresql/contrib/README.apachelog
+share/doc/postgresql/contrib/README.array_iterator
+share/doc/postgresql/contrib/README.btree_gist
+share/doc/postgresql/contrib/README.chkpass
+share/doc/postgresql/contrib/README.cube
+share/doc/postgresql/contrib/README.dbf2pg
+share/doc/postgresql/contrib/README.dblink
+share/doc/postgresql/contrib/README.dbmirror
+share/doc/postgresql/contrib/README.dbsize
+share/doc/postgresql/contrib/README.earthdistance
+share/doc/postgresql/contrib/README.findoidjoins
+share/doc/postgresql/contrib/README.fti
+share/doc/postgresql/contrib/README.fuzzystrmatch
+share/doc/postgresql/contrib/README.int_aggregate
+share/doc/postgresql/contrib/README.intarray
+share/doc/postgresql/contrib/README.isbn_issn
+share/doc/postgresql/contrib/README.lo
+share/doc/postgresql/contrib/README.ltree
+share/doc/postgresql/contrib/README.misc_utils
+share/doc/postgresql/contrib/README.noup
+share/doc/postgresql/contrib/README.oid2name
+share/doc/postgresql/contrib/README.pg_dumplo
+share/doc/postgresql/contrib/README.pg_logger
+share/doc/postgresql/contrib/README.pgbench
+share/doc/postgresql/contrib/README.pgbench_jis
+share/doc/postgresql/contrib/README.pgcrypto
+share/doc/postgresql/contrib/README.pgstattuple
+share/doc/postgresql/contrib/README.pgstattuple.euc_jp
+share/doc/postgresql/contrib/README.rserv
+share/doc/postgresql/contrib/README.rtree_gist
+share/doc/postgresql/contrib/README.seg
+share/doc/postgresql/contrib/README.soundex
+share/doc/postgresql/contrib/README.spi
+share/doc/postgresql/contrib/README.string_io
+share/doc/postgresql/contrib/README.tablefunc
+share/doc/postgresql/contrib/README.tsearch
+share/doc/postgresql/contrib/README.user_locks
+share/doc/postgresql/contrib/README.vacuumlo
+share/doc/postgresql/contrib/autoinc.example
+share/doc/postgresql/contrib/insert_username.example
+share/doc/postgresql/contrib/moddatetime.example
+share/doc/postgresql/contrib/refint.example
+share/doc/postgresql/contrib/timetravel.example
+share/postgresql/contrib/RServ.pm
+share/postgresql/contrib/_int.sql
+share/postgresql/contrib/array_iterator.sql
+share/postgresql/contrib/autoinc.sql
+share/postgresql/contrib/btree_gist.sql
+share/postgresql/contrib/chkpass.sql
+share/postgresql/contrib/cube.sql
+share/postgresql/contrib/dblink.sql
+share/postgresql/contrib/dbsize.sql
+share/postgresql/contrib/earthdistance.sql
+share/postgresql/contrib/fti.sql
+share/postgresql/contrib/fuzzystrmatch.sql
+share/postgresql/contrib/insert_username.sql
+share/postgresql/contrib/int_aggregate.sql
+share/postgresql/contrib/isbn_issn.sql
+share/postgresql/contrib/lo.sql
+share/postgresql/contrib/lo_drop.sql
+share/postgresql/contrib/lo_test.sql
+share/postgresql/contrib/ltree.sql
+share/postgresql/contrib/master.sql
+share/postgresql/contrib/misc_utils.sql
+share/postgresql/contrib/moddatetime.sql
+share/postgresql/contrib/noup.sql
+share/postgresql/contrib/pgcrypto.sql
+share/postgresql/contrib/pgstattuple.sql
+share/postgresql/contrib/refint.sql
+share/postgresql/contrib/rtree_gist.sql
+share/postgresql/contrib/seg.sql
+share/postgresql/contrib/slave.sql
+share/postgresql/contrib/string_io.sql
+share/postgresql/contrib/tablefunc.sql
+share/postgresql/contrib/timetravel.sql
+share/postgresql/contrib/tsearch.sql
+share/postgresql/contrib/user_locks.sql
+@unexec rmdir %D/share/postgresql/contrib >&2 2> /dev/null || true
+@unexec rmdir %D/share/postgresql >&2 2> /dev/null || true
+@unexec rmdir %D/share/doc/postgresql/contrib >&2 2> /dev/null || true
+@unexec rmdir %D/share/doc/postgresql >&2 2> /dev/null || true
+@unexec rmdir %D/lib/postgresql >&2 2> /dev/null || true