diff --git a/databases/Makefile b/databases/Makefile
index caf7da3d6cee..dafe4304ec3c 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -22,6 +22,7 @@
     SUBDIR += dbtool
     SUBDIR += dbview
     SUBDIR += edb
+    SUBDIR += erserver
     SUBDIR += fastdb
     SUBDIR += firebird
     SUBDIR += firebird-devel
diff --git a/databases/erserver/Makefile b/databases/erserver/Makefile
new file mode 100644
index 000000000000..d7d168b813c1
--- /dev/null
+++ b/databases/erserver/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	PostgreSQL eRServer
+# Date created:		1 Sep 2003
+# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	erserver
+PORTVERSION=	1.2
+CATEGORIES=	databases
+MASTER_SITES=	ftp://gborg.postgresql.org/pub/erserver/stable/
+DISTNAME=	${PORTNAME}_v${PORTVERSION}
+DIST_SUBDIR=	postgresql
+
+MAINTAINER=	kuriyama@FreeBSD.org
+COMMENT=	Trigger-based asynchronous replication system for PostgreSQL
+
+BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
+		${PGINC}/executor/spi.h:${PORTSDIR}/databases/postgresql7
+RUN_DEPENDS=	${JAVAJARDIR}/log4j.jar:${PORTSDIR}/java/jakarta-log4j \
+		psql:${PORTSDIR}/databases/postgresql7
+
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_JAVA=	1.2+
+USE_PERL5=	yes
+CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME} JAVA=${JAVA}
+CONFIGURE_ARGS=	--with-pgincludes=${PGINC}
+MAKE_ENV=	JAVA_HOME=${JAVA_HOME} JAVA=${JAVA} \
+		PATH=${JAVA_HOME}/bin:${PATH}
+MAKE_ARGS=	sqldir=${DATADIR} templdir=${DATADIR} docdir=${DOCSDIR} \
+		libdir=${PREFIX}/lib/postgresql javadir=${JAVAJARDIR} \
+		siteperldir=${SITE_PERL}
+
+PGINC=		${PREFIX}/include/postgresql/server
+
+pre-install:
+	${MKDIR} ${PREFIX}/share/doc/erserver
+
+.include <bsd.port.mk>
diff --git a/databases/erserver/distinfo b/databases/erserver/distinfo
new file mode 100644
index 000000000000..8b2ea34b7c17
--- /dev/null
+++ b/databases/erserver/distinfo
@@ -0,0 +1,2 @@
+MD5 (postgresql/erserver_v1.2.tar.gz) = e941c6e4f6297e3e48bcbe041d60f0dc
+MD5 (postgresql/postgresql-base-7.3.4.tar.gz) = 2b8600cc0f0c2d80271b533c394c886b
diff --git a/databases/erserver/files/patch-Makefile b/databases/erserver/files/patch-Makefile
new file mode 100644
index 000000000000..6ab60658af0f
--- /dev/null
+++ b/databases/erserver/files/patch-Makefile
@@ -0,0 +1,41 @@
+--- Makefile.orig	Wed Aug 27 04:00:14 2003
++++ Makefile	Mon Sep  1 15:52:21 2003
+@@ -37,8 +37,8 @@
+ 	templates/replication.cfg-template
+ CONFS	= etc/repliclog.cfg
+ OSQLS	= sql/lastchg_install.sql sql/lastchg_remove.sql
+-JARS	= jar/jdbc7.0-1.2.jar jar/log4j.jar
+-ERJAR	= jar/erserver.jar
++JARS	= jar/jdbc7.0-1.2.jar
++ERJAR	= 
+ RHSCRIPT = scripts/erserver.redhat
+ FBSCRIPT = scripts/erserver.freebsd
+ NBSCRIPT = scripts/erserver.netbsd
+@@ -70,16 +70,15 @@
+ 	  $(INSTALL_DATA) $$file $(sqldir) || exit ; \
+ 	done
+ 	for file in $(JARS); do \
+-	  $(INSTALL_DATA) $$file $(libdir) || exit ; \
++	  $(INSTALL_DATA) $$file $(javadir) || exit ; \
+ 	done
+ 	for file in $(TMPLS); do \
+ 	  $(INSTALL_SCRIPT) $$file $(templdir) || exit ; \
+ 	done
+ 	for file in $(ERJAR); do \
+-	  $(INSTALL_DATA) $$file $(libdir) || exit ; \
++	  $(INSTALL_DATA) $$file $(javadir) || exit ; \
+ 	done
+-	$(INSTALL_DATA) $(PERLS) $(libdir)
+-	$(INSTALL_DATA) docs/INSTALL $(basedir)
++	$(INSTALL_DATA) $(PERLS) $(siteperldir)
+ 	$(INSTALL_SHLIB) $(SONAME) $(libdir)
+ 	$(INSTALL_SHLIB) $(SOPTE) $(libdir)
+ 	# If running on RedHat, install its startup script
+@@ -92,7 +91,6 @@
+ 
+ installdirs:
+ 	$(mkinstalldirs) $(bindir) \
+-	  $(libdir) $(docdir) $(logdir) \
+ 	  $(sysconfdir) $(sqldir) $(templdir)
+ 
+ clean distclean maintainer-clean:
diff --git a/databases/erserver/pkg-descr b/databases/erserver/pkg-descr
new file mode 100644
index 000000000000..ea628932445e
--- /dev/null
+++ b/databases/erserver/pkg-descr
@@ -0,0 +1,5 @@
+eRServer is a descendent from the rserv code. It is a
+trigger-based single-master/multi-slave asynchronous
+replication system.
+
+WWW: http://www.erserver.com/
diff --git a/databases/erserver/pkg-plist b/databases/erserver/pkg-plist
new file mode 100644
index 000000000000..e9667e110d87
--- /dev/null
+++ b/databases/erserver/pkg-plist
@@ -0,0 +1,32 @@
+bin/ers_addslave
+bin/ers_addtable
+bin/ers_ctl
+bin/ers_masterremovefunctions
+bin/ers_masterremovetables
+bin/ers_mastershowcolumns
+bin/ers_mastershowtables
+bin/ers_monitor
+bin/ers_remove
+bin/ers_setup
+bin/ers_slaveincludetable
+bin/ers_slaveremovetables
+bin/ers_slaveshowcolumns
+bin/ers_slaveshowtables
+share/doc/erserver/diagram.gif
+share/doc/erserver/install.html
+share/doc/erserver/install.pdf
+share/doc/erserver/install.txt
+share/doc/erserver/logo.png
+etc/repliclog.cfg
+share/java/classes/jdbc7.0-1.2.jar
+@comment share/java/classes/erserver.jar
+share/erserver/erserver.freebsd
+share/erserver/lastchg_install.sql
+share/erserver/lastchg_remove.sql
+share/erserver/ers_setvars-template
+share/erserver/replication.cfg-template
+lib/postgresql/pte.so
+lib/postgresql/erserver.so
+%%SITE_PERL%%/eRServer.pm
+@dirrm share/doc/erserver
+@dirrm share/erserver