diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index a1f082f9c07..5d1e8806abb 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 1998/10/08 04:42:57 marc Exp $
+# $OpenBSD: Makefile,v 1.11 1998/10/19 09:52:49 form Exp $
 # FreeBSD: Makefile,v 1.25 1998/04/22 08:28:07 asami Exp
 #
 
@@ -87,9 +87,9 @@ post-install:
 	else \
 		${ECHO} 'Found existing PostgreSQL database(s) -- skipping database initializing...'; \
 	fi
-	${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl > ${PREFIX}/etc/rc.d/pgsql.sh
-	chmod 554 ${PREFIX}/etc/rc.d/pgsql.sh
-	chown root.pgsql ${PREFIX}/etc/rc.d/pgsql.sh
+	${SED} -e "s=!!PREFIX!!=${PREFIX}=g" < ${FILESDIR}/pgsql.sh.tmpl > ${PREFIX}/pgsql/bin/pgsql.sh
+	chmod 554 ${PREFIX}/pgsql/bin/pgsql.sh
+	chown root.pgsql ${PREFIX}/pgsql/bin/pgsql.sh
 	${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/pgsql
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/pgsql
diff --git a/databases/postgresql/files/post-install-notes b/databases/postgresql/files/post-install-notes
index 9592e67a21d..d485db4d65e 100644
--- a/databases/postgresql/files/post-install-notes
+++ b/databases/postgresql/files/post-install-notes
@@ -15,7 +15,7 @@ TCL/TK based database frontend "pgaccess" for database operations.
 Add this line to /etc/rc.local if you wish to start PostgreSQL
 automatically:
 
-	[ -x /usr/local/etc/rc.d/pgsql.sh ] && /usr/local/etc/rc.d/pgsql.sh
+	[ -x /usr/local/pgsql/bin/pgsql.sh ] && /usr/local/pgsql/bin/pgsql.sh
 
 If you are upgrading previous version of this port, please note that
 database directory has been moved from /usr/local/pgsql/data
diff --git a/databases/postgresql/pkg/PLIST b/databases/postgresql/pkg/PLIST
index 27c37230453..ec4e1d825d3 100644
--- a/databases/postgresql/pkg/PLIST
+++ b/databases/postgresql/pkg/PLIST
@@ -1,4 +1,3 @@
-etc/rc.d/pgsql.sh
 pgsql/.profile
 pgsql/bin/cleardbdir
 pgsql/bin/createdb
@@ -9,6 +8,7 @@ pgsql/bin/ecpg
 pgsql/bin/initdb
 pgsql/bin/initlocation
 pgsql/bin/ipcclean
+pgsql/bin/pgsql.sh
 pgsql/bin/pg_dump
 pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
diff --git a/databases/postgresql/pkg/PLIST.alpha b/databases/postgresql/pkg/PLIST.alpha
index 931d7c1be3b..5fc647294ff 100644
--- a/databases/postgresql/pkg/PLIST.alpha
+++ b/databases/postgresql/pkg/PLIST.alpha
@@ -1,4 +1,3 @@
-etc/rc.d/pgsql.sh
 pgsql/.profile
 pgsql/bin/cleardbdir
 pgsql/bin/createdb
@@ -14,6 +13,7 @@ pgsql/bin/pg_dumpall
 pgsql/bin/pg_id
 pgsql/bin/pg_passwd
 pgsql/bin/pg_version
+pgsql/bin/pgsql.sh
 @unexec rm -f %D/pgsql/bin/pgtclsh
 @unexec rm -f %D/pgsql/bin/pgtksh
 pgsql/bin/postgres