diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index 35ccbf965a59..93fe1204b923 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -8,6 +8,7 @@
 # See Mk/bsd.databases.mk for more info
 
 PORTNAME=	postgresql
+PORTREVISION=	0
 PKGNAMESUFFIX=	-client
 
 COMMENT=	PostgreSQL database (client)
diff --git a/databases/postgresql84-contrib/Makefile b/databases/postgresql84-contrib/Makefile
index 87156b749591..60e1a854ee24 100644
--- a/databases/postgresql84-contrib/Makefile
+++ b/databases/postgresql84-contrib/Makefile
@@ -2,12 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX=	-contrib
+PORTREVISION=	0
 CATEGORIES=	databases
+PKGNAMESUFFIX=	-contrib
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	The contrib utilities from the PostgreSQL distribution
 
+LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2
+
 USE_PGSQL=	yes
 DEFAULT_PGSQL_VER=84
 MASTERDIR=	${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server
@@ -19,7 +22,6 @@ INSTALL_DIRS=	contrib
 
 SLAVE_ONLY=	yes
 CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl
-LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/contrib/README
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 4681b3730589..bb13db06c3d2 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	8.4.17
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 728b82bacf3a..00db0a135607 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -402,6 +402,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Asia/Kashgar
 %%TZDATA%%share/postgresql/timezone/Asia/Kathmandu
 %%TZDATA%%share/postgresql/timezone/Asia/Katmandu
+%%TZDATA%%share/postgresql/timezone/Asia/Khandyga
 %%TZDATA%%share/postgresql/timezone/Asia/Kolkata
 %%TZDATA%%share/postgresql/timezone/Asia/Krasnoyarsk
 %%TZDATA%%share/postgresql/timezone/Asia/Kuala_Lumpur
@@ -446,6 +447,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Asia/Ulaanbaatar
 %%TZDATA%%share/postgresql/timezone/Asia/Ulan_Bator
 %%TZDATA%%share/postgresql/timezone/Asia/Urumqi
+%%TZDATA%%share/postgresql/timezone/Asia/Ust-Nera
 %%TZDATA%%share/postgresql/timezone/Asia/Vientiane
 %%TZDATA%%share/postgresql/timezone/Asia/Vladivostok
 %%TZDATA%%share/postgresql/timezone/Asia/Yakutsk
@@ -554,6 +556,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Europe/Brussels
 %%TZDATA%%share/postgresql/timezone/Europe/Bucharest
 %%TZDATA%%share/postgresql/timezone/Europe/Budapest
+%%TZDATA%%share/postgresql/timezone/Europe/Busingen
 %%TZDATA%%share/postgresql/timezone/Europe/Chisinau
 %%TZDATA%%share/postgresql/timezone/Europe/Copenhagen
 %%TZDATA%%share/postgresql/timezone/Europe/Dublin