diff --git a/security/Makefile b/security/Makefile
index d7751c9cb732..67587fcfe70a 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -803,6 +803,7 @@
     SUBDIR += saferpay
     SUBDIR += safesh
     SUBDIR += saint
+    SUBDIR += samba-virusfilter
     SUBDIR += samhain
     SUBDIR += samhain-client
     SUBDIR += samhain-server
diff --git a/security/samba-virusfilter/Makefile b/security/samba-virusfilter/Makefile
new file mode 100644
index 000000000000..5c8ba2ec6b53
--- /dev/null
+++ b/security/samba-virusfilter/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	samba-virusfilter
+# Date created:		06 Dec 2011
+# Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	samba-virusfilter
+PORTVERSION=	0.1.3
+CATEGORIES=	security
+MASTER_SITES=	http://cloud.github.com/downloads/fumiyas/samba-virusfilter/
+
+MAINTAINER=	kuriyama@FreeBSD.org
+COMMENT=	On-access anti-virus filter for Samba
+
+PATCH_DEPENDS=	smbclient:${PORTSDIR}/net/${SAMBA_PORT}
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/${SAMBA_PORT}:configure
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+ALL_TARGET=			# should empty
+CONFIGURE_ARGS=	--with-samba-source=`cd ${PORTSDIR}/net/${SAMBA_PORT}; ${MAKE} -VWRKSRC` \
+	--with-clamd=${PREFIX}/sbin/clamd --with-savdid=${PREFIX}/bin/savdid
+SAMBA_PORT?=	samba36
+USE_AUTOTOOLS=	autoconf autoheader # for net/${SAMBA_PORT} configure
+MAKE_ARGS=	SAMBA_DATADIR=${PREFIX}
+
+.include <bsd.port.mk>
diff --git a/security/samba-virusfilter/distinfo b/security/samba-virusfilter/distinfo
new file mode 100644
index 000000000000..50d6018607d8
--- /dev/null
+++ b/security/samba-virusfilter/distinfo
@@ -0,0 +1,2 @@
+SHA256 (samba-virusfilter-0.1.3.tar.bz2) = b3c1bcb0a9fa1517017637c5e010dd95a967ff5e069b851625a2bb2d379bc73a
+SIZE (samba-virusfilter-0.1.3.tar.bz2) = 73103
diff --git a/security/samba-virusfilter/pkg-descr b/security/samba-virusfilter/pkg-descr
new file mode 100644
index 000000000000..889a5466f122
--- /dev/null
+++ b/security/samba-virusfilter/pkg-descr
@@ -0,0 +1,9 @@
+This is a set of various Samba VFS modules to scan and filter virus
+files on Samba file services with an anti-virus scanner.
+
+Supported Anti-Virus engines:
+  - ClamAV (clamd daemon)
+  - F-Secure Anti-Virus (fsavd daemon)
+  - Sophos Anti-Virus (savdid daemon)
+
+WWW: https://github.com/fumiyas/samba-virusfilter
diff --git a/security/samba-virusfilter/pkg-plist b/security/samba-virusfilter/pkg-plist
new file mode 100644
index 000000000000..88635cf19c5e
--- /dev/null
+++ b/security/samba-virusfilter/pkg-plist
@@ -0,0 +1,4 @@
+bin/svf-notify
+lib/samba/vfs/svf-clamav.so
+lib/samba/vfs/svf-fsav.so
+lib/samba/vfs/svf-sophos.so