diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e66f62258d..576deeb156 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
 # Template file for 'postgresql'
 pkgname=postgresql
-version=8.4.17
-revision=3
+version=8.4.21
+revision=1
 build_style=gnu-configure
 configure_args="--with-docdir=/usr/share/doc --with-openssl --with-python
  --with-pam --datadir=/usr/share/postgresql --enable-thread-safety
@@ -13,12 +13,11 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.postgresql.org"
 license="BSD"
 distfiles="ftp://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=dc884c34ec3535d9f8b579155948a703def0574aca47292b97b82a8189cd0436
+checksum=388f67e59f2a16c27e84f50656f5d755adf3d0a883138366d091aa0c727c1e2c
 
 hostmakedepends="flex"
-makedepends="libfl-devel readline-devel>=6.3 openssl-devel perl>=5.16
- tcl-devel>=8.6 python-devel libxml2-devel libxslt-devel pam-devel shadow"
-depends="shadow"
+makedepends="libfl-devel readline-devel>=6.3 libressl-devel perl>=5.16
+ tcl-devel>=8.6 python-devel libxml2-devel libxslt-devel pam-devel"
 conf_files="
 	/etc/default/${pkgname}
 	/etc/pam.d/${pkgname}
@@ -31,7 +30,6 @@ postgres_shell="/bin/sh"
 postgres_descr="PostgreSQL database server user"
 
 if [ "$CROSS_BUILD" ]; then
-	CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/libxml2"
 	configure_args+=" --without-perl --without-python --without-tcl"
 fi