diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index f75fe0d955f6..6ebff5406cf7 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -3,6 +3,7 @@
 
 DISTVERSION?=	10rc1
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
+PORTREVISION?=	1
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
diff --git a/databases/postgresql10-server/files/postgresql.in b/databases/postgresql10-server/files/postgresql.in
index 6aec93149077..408d933ec4c1 100644
--- a/databases/postgresql10-server/files/postgresql.in
+++ b/databases/postgresql10-server/files/postgresql.in
@@ -10,7 +10,7 @@
 #
 #  postgresql_enable="YES"
 #  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data96"
+#  postgresql_data="/var/db/%%PG_USER%%/data10"
 #  postgresql_flags="-w -s -m fast"
 #  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
 #  postgresql_class="default"
@@ -34,7 +34,7 @@ load_rc_config postgresql
 postgresql_enable=${postgresql_enable:-"NO"}
 postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
 postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data96"}
+eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data10"}
 postgresql_class=${postgresql_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
diff --git a/databases/postgresql95-plperl/Makefile b/databases/postgresql95-plperl/Makefile
index d4aa85d93c75..c70eefbd69cf 100644
--- a/databases/postgresql95-plperl/Makefile
+++ b/databases/postgresql95-plperl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTREVIOSION=	0
+PORTREVISION=	0
 CATEGORIES=	databases perl5
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
diff --git a/databases/postgresql95-plpython/Makefile b/databases/postgresql95-plpython/Makefile
index e3ff0e2eb64e..b7ee58be7576 100644
--- a/databases/postgresql95-plpython/Makefile
+++ b/databases/postgresql95-plpython/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	postgresql
 CATEGORIES=	databases python
+PORTREVISION=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
diff --git a/databases/postgresql96-docs/Makefile b/databases/postgresql96-docs/Makefile
index 0aaca684f5ad..ebfdfdc82250 100644
--- a/databases/postgresql96-docs/Makefile
+++ b/databases/postgresql96-docs/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+PORTREVISION=   0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S,.,,}-docs
-DISTV=	${DISTVERSION:R}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The PostgreSQL documentation set
@@ -11,6 +11,8 @@ COMMENT=	The PostgreSQL documentation set
 MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
 WANT_PGSQL_VER?=9.6
 
+DISTV=		${DISTVERSION:R}
+
 SLAVE_ONLY=	YES
 COMPONENT=	-docs
 
@@ -41,5 +43,4 @@ post-install:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \
 	     ${SED} 's,.*,@unexec rmdir %D/& 2>/dev/null || true,' >>${TMPPLIST}
 
-
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql96-pltcl/Makefile b/databases/postgresql96-pltcl/Makefile
index 97d3f4a17060..4ded6de77ded 100644
--- a/databases/postgresql96-pltcl/Makefile
+++ b/databases/postgresql96-pltcl/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
+PORTREVISION=	0
 CATEGORIES=	databases tcl
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}