diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 45eaa754a5c..2a135faebdb 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,9 +1,11 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.99.2
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --libdir=/usr/lib --with-pcre=/usr"
+# XXX: system llvm is too new (< 3.7 required)
+# Shipped llvm does not build with gcc6
+configure_args="--sbindir=/usr/bin --libdir=/usr/lib --with-pcre=/usr --disable-llvm"
 conf_files="/etc/clamd.conf /etc/freshclam.conf"
 system_accounts="clamav"
 clamav_homedir="/var/lib/${pkgname}"
@@ -34,6 +36,7 @@ esac
 do_configure() {
 	# Disable detection of sys/cdefs.h (it's obsolete)
 	sed -i configure -e 's; sys/cdefs\.h$;;'
+	sed -i configure -e 's;3\.7;3.9;'
 	# Need to set PCRE_HOME to make --with-pcre=/usr work
 	PCRE_HOME=/usr ./configure ${configure_args}
 }