diff --git a/MOVED b/MOVED
index cc582c7b13c0..a0cfd6de6f04 100644
--- a/MOVED
+++ b/MOVED
@@ -13043,3 +13043,4 @@ sysutils/py-azure-cli-sqlvm|sysutils/py-azure-cli|2019-09-30|Has expired: Incorp
 sysutils/py-azure-cli-storage|sysutils/py-azure-cli|2019-09-30|Has expired: Incorporated into azure-cli package
 sysutils/py-azure-cli-vm|sysutils/py-azure-cli|2019-09-30|Has expired: Incorporated into azure-cli package
 x11-toolkits/qt5-canvas3d||2019-10-01|Has been deprecated upstream
+security/clamav-milter|security/clamav|2019-11-12|Now that MILTER option is enabled by default, use security/clamav instead
diff --git a/security/Makefile b/security/Makefile
index cacbe4584841..891a10f95110 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -87,7 +87,6 @@
     SUBDIR += cl-md5-sbcl
     SUBDIR += clamassassin
     SUBDIR += clamav
-    SUBDIR += clamav-milter
     SUBDIR += clamav-unofficial-sigs
     SUBDIR += clamd-stream-client
     SUBDIR += clamfs
diff --git a/security/clamav-milter/Makefile b/security/clamav-milter/Makefile
deleted file mode 100644
index 7420cec0d48a..000000000000
--- a/security/clamav-milter/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Created by: bz
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-milter
-
-OPTIONS_SLAVE+=	MILTER
-
-MASTERDIR=	${.CURDIR}/../clamav
-PKGNAMESUFFIX=	-milter
-
-CONFLICTS=	clamav-[0-9]*
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 51490d393c2d..06d2561f10c3 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.101.4
+PORTVERSION=	0.102.1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.clamav.net/downloads/production/
@@ -45,8 +45,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 # force to use -lthr until it's not fixed.
 LDFLAGS+=	-lthr -L${LOCALBASE}/lib
 
-CONFLICTS?=	clamav-milter-[0-9]*
-
 SUB_FILES=	pkg-deinstall
 SUB_LIST+=	DBDIR=${DBDIR} \
 		LOGDIR=${LOGDIR} \
@@ -62,23 +60,22 @@ SUB_LIST+=	DBDIR=${DBDIR} \
 PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
 
-OPTIONS_DEFINE=	ARC ARJ LHA UNZOO UNRAR TESTS MILTER MSPACK LDAP ICONV STDERR \
-		EXPERIMENTAL DOCS IPV6 DMG_XAR JSON PCRE
+OPTIONS_DEFINE=	ARC ARJ DOCS DMG_XAR EXPERIMENTAL JSON LDAP ICONV IPV6 \
+		LHA MILTER MSPACK PCRE STDERR TESTS UNZOO UNRAR
 
-OPTIONS_DEFAULT=	ARC ARJ UNZOO UNRAR DMG_XAR \
-			JSON PCRE MSPACK
+OPTIONS_DEFAULT=	ARC ARJ DMG_XAR JSON MILTER PCRE UNZOO UNRAR
 OPTIONS_SUB=	yes
 
 ARC_DESC=		Enable arch archives support
 ARJ_DESC=		Enable arj archives support
+DMG_XAR_DESC=		Enable DMG and XAR archives support
+EXPERIMENTAL_DESC=	Build experimental code
 LHA_DESC=		Enable lha archives support
-UNZOO_DESC=		Enable zoo archives support
-TESTS_DESC=		Run compile-time tests (req. python)
 MILTER_DESC=		Compile the milter interface
 MSPACK_DESC=		Get mspack support from ports (otherwise use bundled)
 STDERR_DESC=		Print logs to stderr instead of stdout
-EXPERIMENTAL_DESC=	Build experimental code
-DMG_XAR_DESC=		Enable DMG and XAR archives support
+TESTS_DESC=		Run compile-time tests (req. python)
+UNZOO_DESC=		Enable zoo archives support
 
 ARC_RUN_DEPENDS=	arc:archivers/arc
 ARJ_RUN_DEPENDS=	arj:archivers/arj
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index b12a14449fb4..308351f85bf7 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566501172
-SHA256 (clamav-0.101.4.tar.gz) = 0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd
-SIZE (clamav-0.101.4.tar.gz) = 21408145
+TIMESTAMP = 1574671743
+SHA256 (clamav-0.102.1.tar.gz) = 0dbda8d0d990d068732966f13049d112a26dce62145d234383467c1d877dedd6
+SIZE (clamav-0.102.1.tar.gz) = 13215586
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index cafdc1699833..90482fa3473d 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -39,10 +39,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html
 %%UNRAR%%lib/libclamunrar.so
 %%UNRAR%%lib/libclamunrar.so.9
-%%UNRAR%%lib/libclamunrar.so.9.0.2
+%%UNRAR%%lib/libclamunrar.so.9.0.4
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.so.9
-%%UNRAR%%lib/libclamunrar_iface.so.9.0.2
+%%UNRAR%%lib/libclamunrar_iface.so.9.0.4
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%
@@ -58,10 +58,15 @@ bin/freshclam
 bin/sigtool
 include/clamav-config.h
 include/clamav-types.h
+include/clamav-version.h
 include/clamav.h
+include/libfreshclam.h
 lib/libclamav.so
 lib/libclamav.so.9
-lib/libclamav.so.9.0.2
+lib/libclamav.so.9.0.4
+lib/libfreshclam.so
+lib/libfreshclam.so.2
+lib/libfreshclam.so.2.0.0
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz