diff --git a/mail/clamfilter/Makefile b/mail/clamfilter/Makefile
index 42c5adcf168f..8a6d87fc84b0 100644
--- a/mail/clamfilter/Makefile
+++ b/mail/clamfilter/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	clamfilter
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.wyae.de/software/ensita-clamfilter/
 
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index aa5b7cc393c8..c43040a43fea 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -13,7 +13,7 @@
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	# set later
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 84584328ef5a..c2d6630f0fc2 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -12,7 +12,7 @@
 
 PORTNAME=	dspam
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	# set later
 
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 98d694e5c580..69dc2422bc62 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.58.9
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
@@ -85,7 +86,7 @@ PLIST_SUB+=	SPAMASSASSIN_SYMLINK="@comment "
 PLIST_SUB+=	SPAMASSASSIN_SYMLINK=""
 .endif
 
-.if defined(WITH_CLAMAV)
+.if !defined(WITHOUT_CLAMAV)
 RUN_DEPENDS+=	clamscan:${PORTSDIR}/security/clamav
 .endif
 
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index ddd0d5f13e4e..733611eb489b 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-ClamAV
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
diff --git a/mail/qscan/Makefile b/mail/qscan/Makefile
index 1b876f3005a3..38c46c209f48 100644
--- a/mail/qscan/Makefile
+++ b/mail/qscan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qscan
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail security
 MASTER_SITES=	ftp://ftp.c9x.org/qscan/
 
diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 2830035a9799..86d953879753 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qsheff-II
 PORTVERSION=	2.1.r2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/qsheff/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index cc9570e3d498..d357ac4e421d 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simscan
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.inter7.com/simscan/
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile
index 53172b4e034f..3f3060aff06b 100644
--- a/security/clamassassin/Makefile
+++ b/security/clamassassin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamassassin
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://drivel.com/clamassassin/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 2ce7bce361f3..9642c5429097 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.90
-PORTREVISION=	3
+PORTVERSION=	0.90.1
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -31,6 +30,10 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
+# This port has a problem with -pthread,
+# force to use -lthr until it's not fixed.
+PTHREAD_LIBS=	-lthr
+
 PORTDOCS=	*
 
 DBDIR=		/var/db/clamav
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 483a3c6b13e5..51ca3c2bd23c 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.90.tar.gz) = f04372e49c3c5ff3bd94bbe1fef2eaca
-SHA256 (clamav-0.90.tar.gz) = c39005318d4a7d27d9710c3d71396b8c500e0bc5a184cb7392051c9ca9dea60d
-SIZE (clamav-0.90.tar.gz) = 11575374
+MD5 (clamav-0.90.1.tar.gz) = cd11c05b5476262eaea4fa3bd7dc25bf
+SHA256 (clamav-0.90.1.tar.gz) = 08a0255b4f6bdc4312eea6c118e79ecf684aed10640b45037d9dc5890c7687be
+SIZE (clamav-0.90.1.tar.gz) = 11643310
diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure
index 6d2d837a7407..42fbdcbea021 100644
--- a/security/clamav/files/patch-configure
+++ b/security/clamav/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Feb 12 23:11:56 2007
-+++ configure	Mon Mar  5 08:25:35 2007
-@@ -22426,19 +22426,25 @@
+--- configure.orig	Thu Mar  1 20:46:19 2007
++++ configure	Tue Mar 13 10:28:27 2007
+@@ -22431,19 +22431,25 @@
      sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
  
  
@@ -26,16 +26,16 @@
  
    fi
  fi
-@@ -23082,7 +23088,7 @@
+@@ -23087,7 +23093,7 @@
      ;;
  freebsd*)
      if test "$have_pthreads" = "yes"; then
--	THREAD_LIBS="-lpthread -lc_r"
+-	THREAD_LIBS="-pthread -lc_r"
 +	THREAD_LIBS="%%PTHREAD_LIBS%%"
  	TH_SAFE="-thread-safe"
  
  cat >>confdefs.h <<\_ACEOF
-@@ -23395,7 +23401,7 @@
+@@ -23427,7 +23433,7 @@
  if test "$have_milter" = "yes"; then
  
          save_LDFLAGS="$LDFLAGS"
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index a071176ce2de..48776a7c6793 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -8,7 +8,7 @@ bin/sigtool
 %%CLAMAV-MILTER%%sbin/clamav-milter
 sbin/clamd
 include/clamav.h
-lib/libclamav.so.1
+lib/libclamav.so.2
 lib/libclamav.so
 lib/libclamav.a
 lib/libclamav.la
diff --git a/security/clamcour/Makefile b/security/clamcour/Makefile
index f12b2ff3fa6b..a4a6023be698 100644
--- a/security/clamcour/Makefile
+++ b/security/clamcour/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamcour
 PORTVERSION=	0.3.8
+PORTREVISION=	1
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.becrux.com/pages/projects/clamcour/
 
@@ -14,9 +15,7 @@ MAINTAINER=	bsd@dino.sk
 COMMENT=	ClamAV courier filter
 
 BUILD_DEPENDS=	courier-config:${PORTSDIR}/mail/courier
-LIB_DEPENDS=	clamav.1:${PORTSDIR}/security/clamav
-
-BROKEN=		Does not compile
+LIB_DEPENDS=	clamav.2:${PORTSDIR}/security/clamav
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/clamcour/files/patch-src__clam.cpp b/security/clamcour/files/patch-src__clam.cpp
new file mode 100644
index 000000000000..f9f8414483a8
--- /dev/null
+++ b/security/clamcour/files/patch-src__clam.cpp
@@ -0,0 +1,22 @@
+--- src/clam.cpp.orig	Sun Oct  1 20:01:37 2006
++++ src/clam.cpp	Tue Feb 20 16:04:03 2007
+@@ -78,8 +78,8 @@
+       memset(&limits,0,sizeof(struct cl_limits));
+       root = NULL;
+ 
+-      if ((err = cl_loaddbdir(cl_retdbdir(), &root, &signo)))
+-        throw cException(CLAMAV_CLASS_NAME,CLAMAV_CLASS_NAME,"cl_loaddbdir",err);
++      if ((err = cl_load(cl_retdbdir(), &root, &signo, CL_DB_STDOPT)))
++        throw cException(CLAMAV_CLASS_NAME,CLAMAV_CLASS_NAME,"cl_load",err);
+ 
+       if ((err = cl_build(root)))
+         throw cException(CLAMAV_CLASS_NAME,CLAMAV_CLASS_NAME,"cl_build",err);
+@@ -214,7 +214,7 @@
+             throw cException(CLAMAV_TASK_NAME,"taskProc","pthread_mutex_lock(dbMutex)",err);
+           cl_free(ptr->root);
+           ptr->root = NULL;
+-          cl_loaddbdir(cl_retdbdir(), &(ptr->root), &signo);
++          cl_load(cl_retdbdir(), &(ptr->root), &signo, CL_DB_STDOPT);
+           cl_build(ptr->root);
+           if ((err = pthread_mutex_unlock(&(ptr->dbMutex))))
+             throw cException(CLAMAV_TASK_NAME,"taskProc","pthread_mutex_unlock(dbMutex)",err,1);
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index 467a875f323e..bc0c0b2b9846 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamsmtp
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://memberwebs.com/nielsen/software/clamsmtp/
 
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 9f4b9622c957..0d0932908e60 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	klamav
 PORTVERSION=	0.41
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	klamav
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 38bc8c45e180..79761a3173a7 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	File-Scan-ClamAV
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	File
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index 186c83ff5855..2aacd1349bd1 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	http://xael.org/norman/python/pyclamav/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A python binding to libclamav written in C
 
-LIB_DEPENDS=	clamav.1:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.2:${PORTSDIR}/security/clamav
 
 DIST_SUBDIR=	python
 USE_PYTHON=	yes
diff --git a/security/squidclam/Makefile b/security/squidclam/Makefile
index 35dadb4b6f59..514f4872abf0 100644
--- a/security/squidclam/Makefile
+++ b/security/squidclam/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squidclam
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 3366f0ff3070..16399ff0bdd4 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	c-icap
 PORTVERSION=	030606
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
@@ -54,8 +54,8 @@ PLIST_SUB+=	PERL="@comment "
 CONFIGURE_ARGS+=	--without-perl
 .endif
 
-.if defined(WITH_CLAMAV)
-LIB_DEPENDS+=	clamav.1:${PORTSDIR}/security/clamav
+.if !defined(WITHOUT_CLAMAV)
+LIB_DEPENDS+=	clamav.2:${PORTSDIR}/security/clamav
 PLIST_SUB+=	CLAMAV=""
 CONFIGURE_ARGS+=	--with-clamav
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/havp/Makefile b/www/havp/Makefile
index 111626f04387..49700b188df7 100644
--- a/www/havp/Makefile
+++ b/www/havp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	havp
 PORTVERSION=	0.82
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.server-side.de/download/ \
 				http://bio3k.softboard.ru/uploads/arch/
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.server-side.de/download/ \
 MAINTAINER=	b3k@mail.ru
 COMMENT=	HTTP Antivirus Proxy
 
-LIB_DEPENDS=	clamav.1:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.2:${PORTSDIR}/security/clamav
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 85550c032897..7b8ec281b6e0 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_clamav
 PORTVERSION=	0.21
+PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	http://software.othello.ch/mod_clamav/
 
diff --git a/www/raqdevil/Makefile b/www/raqdevil/Makefile
index 231f424aec01..4bd37a74f379 100644
--- a/www/raqdevil/Makefile
+++ b/www/raqdevil/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	raqdevil
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www sysutils
 MASTER_SITES=	http://www.raqdevil.com/