diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index cbf604713a7..1fc54c971ac 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,15 +1,14 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
-version=8.7.0
+version=8.8.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-gnutls --enable-mysql --enable-pgsql
  --enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5
- --enable-zlib --enable-imptcp --enable-imttcp --enable-mmsnmptrapd
+ --enable-imptcp --enable-mmsnmptrapd
  --enable-impstats --enable-omprog --enable-omstdout
  --enable-pmlastmsg --enable-pmcisconames --enable-pmaixforwardedfrom
- --enable-pmsnare --enable-pmrfc3164sd --enable-omuxsock
- --disable-generate-man-pages
+ --enable-pmsnare --enable-omuxsock --disable-generate-man-pages
  $(vopt_enable systemd imjournal) $(vopt_enable systemd omjournal)
  $(vopt_if systemd --with-systemdsystemunitdir=/usr/lib/systemd/system)"
 short_desc="An Enhanced multi-threaded syslog daemon"
@@ -17,12 +16,12 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.rsyslog.com"
 distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz"
-checksum=c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c
+checksum=147a7e474665af7a817ac18d7924e26448350a77572e7fd9cfe284cb6291a0eb
 
 # Package build options
 build_options="systemd"
 lib32disabled=yes
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config postgresql-libs-devel"
 makedepends="json-c-devel gnutls-devel>=3.1.5 postgresql-libs-devel
  libmysqlclient-devel>=5.5.27 mit-krb5-devel libestr-devel>=0.1.9
  libee-devel>=0.4.1 liblogging-devel>=1.0.3 $(vopt_if systemd systemd-devel)"
@@ -31,19 +30,11 @@ provides="syslog-daemon-0_1"
 replaces="syslog-daemon>=0"
 make_dirs="/etc/rsyslog.d 0755 root root"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" libgcrypt-devel libmysqlclient-devel postgresql-libs-devel"
-	pre_configure() {
-		sed -e "s,\`mysql_config --cflags\`,\"-I$XBPS_CROSS_BASE/usr/include/mysql ${CFLAGS}\",g" -i configure
-		sed -e "s,\`mysql_config --libs\`,-L$XBPS_CROSS_BASE/usr/lib,g" -i configure
-		sed -e "s,\`pg_config --libdir\`,$XBPS_CROSS_BASE/usr/lib,g" -i configure
-		sed -e "s,\`pg_config --includedir\`,$XBPS_CROSS_BASE/usr/include,g" -i configure
-	}
-fi
-
-
-post_configure() {
-	echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >> tools/Makefile
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		sed -e "s,\`\$PG_CONFIG --libdir\`,\"$XBPS_CROSS_BASE/usr/lib\",g" -i configure
+		sed -e "s,\`\$PG_CONFIG --includedir\`,\"$XBPS_CROSS_BASE/usr/include\",g" -i configure
+	fi
 }
 post_install() {
 	vsv rsyslogd