diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 98a368c6118..1afa1ce4640 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.100.1
-revision=2
+revision=3
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc6
@@ -11,7 +11,7 @@ configure_args="--sbindir=/usr/bin --libdir=/usr/lib
  --with-system-libmspack=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/clamd.conf /etc/freshclam.conf"
 system_accounts="_clamav"
-clamav_homedir="/var/lib/${pkgname}"
+clamav_homedir="/var/lib/_${pkgname}"
 clamav_descr="ClamAV user"
 hostmakedepends="flex pkg-config zip"
 makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel
@@ -46,14 +46,14 @@ post_install() {
 	vsconf etc/clamd.conf.sample
 	sed -i ${PKGDESTDIR}/etc/clamd.conf \
 		-e "s;^Example$;# Example;" \
-		-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/${pkgname};"
+		-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/_${pkgname};"
 
 	# Enable and patch freshclam configuration
 	mv -v ${PKGDESTDIR}/etc/freshclam.conf.sample ${PKGDESTDIR}/etc/freshclam.conf
 	vsconf etc/freshclam.conf.sample
 	sed -i ${PKGDESTDIR}/etc/freshclam.conf \
 		-e "s;^Example$;# Example;" \
-		-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/${pkgname};"
+		-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/_${pkgname};"
 }
 clamav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"