diff -Nru clamav-0.99.2+dfsg/debian/control clamav-0.99.2+dfsg/debian/control
--- clamav-0.99.2+dfsg/debian/control	2017-01-30 20:27:31.000000000 +0000
+++ clamav-0.99.2+dfsg/debian/control	2017-07-12 14:25:31.000000000 +0000
@@ -26,7 +26,7 @@
                libsystemd-dev [linux-any],
                libtfm-dev,
                libxml2-dev,
-               llvm-dev [i386 amd64 kfreebsd-amd64 kfreebsd-i386],
+               llvm-3.9-dev [i386 amd64 kfreebsd-amd64 kfreebsd-i386],
                perl:native,
                pkg-config,
                po-debconf,
diff -Nru clamav-0.99.2+dfsg/debian/patches/fix-zlib-check-11711.patch clamav-0.99.2+dfsg/debian/patches/fix-zlib-check-11711.patch
--- clamav-0.99.2+dfsg/debian/patches/fix-zlib-check-11711.patch	1970-01-01 00:00:00.000000000 +0000
+++ clamav-0.99.2+dfsg/debian/patches/fix-zlib-check-11711.patch	2017-07-12 14:21:43.000000000 +0000
@@ -0,0 +1,26 @@
+Description: fix zlib version check
+ The configure script was trying to check for zlib versions 1.2.0 and
+ 1.2.1 but used an incorrect grep expression for that, essentially
+ making it a substring match. As a result, zlib versions like 1.2.11
+ were being incorrectly flagged as vulnerable and fail the script.
+Origin: upstream, https://github.com/vrtadmin/clamav-devel/commit/f0bcd186190fe6e67b3f0eaaceb7a99aa6a98865
+Bug: https://bugzilla.clamav.net/show_bug.cgi?id=11711
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Last-Update: 2017-07-12
+
+--- clamav-0.99.2+dfsg.orig/m4/reorganization/libs/libz.m4
++++ clamav-0.99.2+dfsg/m4/reorganization/libs/libz.m4
+@@ -29,9 +29,9 @@ then
+     AC_MSG_ERROR([Please install zlib and zlib-devel packages])
+ else
+ 
+-    vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
++    vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h`
+     if test -z "$vuln"; then
+-	vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`
++	vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`
+     fi
+ 
+     if test -n "$vuln"; then
diff -Nru clamav-0.99.2+dfsg/debian/patches/series clamav-0.99.2+dfsg/debian/patches/series
--- clamav-0.99.2+dfsg/debian/patches/series	2017-01-30 20:27:33.000000000 +0000
+++ clamav-0.99.2+dfsg/debian/patches/series	2017-07-12 14:21:50.000000000 +0000
@@ -12,3 +12,4 @@
 Add-support-for-LLVM-3.9.patch
 bb11549-fix-temp-file-cleanup-issue.patch
 Fix_detection_of_libcurl.patch
+fix-zlib-check-11711.patch
diff -Nru clamav-0.99.2+dfsg/debian/rules clamav-0.99.2+dfsg/debian/rules
--- clamav-0.99.2+dfsg/debian/rules	2017-01-30 20:27:31.000000000 +0000
+++ clamav-0.99.2+dfsg/debian/rules	2017-07-12 14:25:31.000000000 +0000
@@ -30,7 +30,7 @@
 ifeq (,$(filter $(DEB_HOST_ARCH), i386 amd64 kfreebsd-amd64 kfreebsd-i386))
   export enable_llvm=no
 else
-    SYSTEM_LLVM = -with-system-llvm=/usr/bin/llvm-config --with-llvm-linking=dynamic
+    SYSTEM_LLVM = -with-system-llvm=/usr/bin/llvm-config-3.9 --with-llvm-linking=dynamic
 endif
 
 # Set the configure options: