diff --git a/app-antivirus/clamav/clamav-0.99.2-r2.ebuild b/app-antivirus/clamav/clamav-0.99.2-r3.ebuild
similarity index 100%
rename from app-antivirus/clamav/clamav-0.99.2-r2.ebuild
rename to app-antivirus/clamav/clamav-0.99.2-r3.ebuild
diff --git a/app-antivirus/clamav/files/clamd.service b/app-antivirus/clamav/files/clamd.service
index efdab4314a224..75aa2ccb624db 100644
--- a/app-antivirus/clamav/files/clamd.service
+++ b/app-antivirus/clamav/files/clamd.service
@@ -1,7 +1,12 @@
-.include /usr/lib/systemd/system/clamd@.service
-
 [Unit]
-Description=Generic ClamAV scanner daemon
+Description=clamd scanner daemon
+After=nss-lookup.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/clamd
+Restart=on-failure
+PrivateTmp=true
 
 [Install]
 WantedBy=multi-user.target
diff --git a/app-antivirus/clamav/files/clamd_at.service b/app-antivirus/clamav/files/clamd_at.service
index c5ad8dfa68998..9008ba7e82edc 100644
--- a/app-antivirus/clamav/files/clamd_at.service
+++ b/app-antivirus/clamav/files/clamd_at.service
@@ -7,3 +7,6 @@ Type=forking
 ExecStart=/usr/sbin/clamd -c /etc/clamd%i.conf
 Restart=on-failure
 PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target