diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index d0195dab724..dacfd49829a 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.64 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.65 2011/01/05 06:06:48 ajacoutot Exp $
 
 COMMENT=		virus scanner
 DISTNAME=		clamav-0.96.5
 
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		security
 SHARED_LIBS=		clamav 17.0 \
diff --git a/security/clamav/pkg/PLIST b/security/clamav/pkg/PLIST
index bae959752bc..e4ea4c0b474 100644
--- a/security/clamav/pkg/PLIST
+++ b/security/clamav/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2010/11/04 11:18:12 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.17 2011/01/05 06:06:49 ajacoutot Exp $
 @newgroup _clamav:539
 @newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin
 bin/clamav-config
@@ -59,5 +59,5 @@ share/examples/clamav/clamd.conf
 share/examples/clamav/ex1.c
 share/examples/clamav/freshclam.conf
 @sample ${SYSCONFDIR}/freshclam.conf
-@rcscript ${RCDIR}/clamav_daemon
-@rcscript ${RCDIR}/clamav_freshclam
+@rcscript ${RCDIR}/clamd
+@rcscript ${RCDIR}/freshclam
diff --git a/security/clamav/pkg/clamav_daemon.rc b/security/clamav/pkg/clamd.rc
similarity index 56%
rename from security/clamav/pkg/clamav_daemon.rc
rename to security/clamav/pkg/clamd.rc
index 9218178a7c7..800ead1e884 100644
--- a/security/clamav/pkg/clamav_daemon.rc
+++ b/security/clamav/pkg/clamd.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: clamav_daemon.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: clamd.rc,v 1.1 2011/01/05 06:06:49 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/sbin/clamd"
 
diff --git a/security/clamav/pkg/clamav_freshclam.rc b/security/clamav/pkg/freshclam.rc
similarity index 60%
rename from security/clamav/pkg/clamav_freshclam.rc
rename to security/clamav/pkg/freshclam.rc
index baa86c66e86..69bc6539e84 100644
--- a/security/clamav/pkg/clamav_freshclam.rc
+++ b/security/clamav/pkg/freshclam.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: clamav_freshclam.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: freshclam.rc,v 1.1 2011/01/05 06:06:49 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/bin/freshclam"
 daemon_flags="-d"