diff --git a/mail/Makefile b/mail/Makefile
index 54ffbd0520b5..bc47b6def442 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -520,6 +520,7 @@
     SUBDIR += xpbiff
     SUBDIR += yadda
     SUBDIR += yuzu
+    SUBDIR += zabit
     SUBDIR += zmailer
 #   SUBDIR += mailman-devel
 
diff --git a/mail/zabit/Makefile b/mail/zabit/Makefile
new file mode 100644
index 000000000000..4d0353f38afc
--- /dev/null
+++ b/mail/zabit/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for:   zabit
+# Date created:                 14 May 2005
+# Whom:                         Ozkan KIRIK <ozkan@enderunix.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	zabit
+PORTVERSION=	0.7.1
+CATEGORIES=	mail
+MASTER_SITES=	http://www.enderunix.org/zabit/
+
+MAINTAINER=	ozkan@enderunix.org
+COMMENT=	Zabit is a content/attachment filter for qmail
+
+RUN_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail
+
+HAS_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
+QMAIL_DIR?=     ${LOCALBASE}/qmail
+.else
+QMAIL_DIR?=     /var/qmail
+.endif
+QMAIL_QUEUE=    ${QMAIL_DIR}/bin/qmail-queue
+
+pre-build:
+.if !defined(BATCH)
+	@${DIALOG} --title "${PORTNAME} - ${PORTVERSION} Configuration Menu"\
+		--menu "Choose your locale for case insensitive search" 20 60 13\
+		en_US English\
+		tr_TR Turkish\
+		2>${WRKSRC}/conf-locale
+.else
+	@${ECHO_CMD} "en_US" > ${WRKSRC}/conf-locale
+.endif
+	@${ECHO_CMD} >> ${WRKSRC}/conf-locale
+	@${ECHO_MSG} "===> Locale: `cat ${WRKSRC}/conf-locale`"
+
+.include <bsd.port.post.mk>
diff --git a/mail/zabit/distinfo b/mail/zabit/distinfo
new file mode 100644
index 000000000000..77653ba8813b
--- /dev/null
+++ b/mail/zabit/distinfo
@@ -0,0 +1,2 @@
+MD5 (zabit-0.7.1.tar.gz) = eac19fe76a63a326a9c31c8bc3f7ff45
+SIZE (zabit-0.7.1.tar.gz) = 17783
diff --git a/mail/zabit/pkg-descr b/mail/zabit/pkg-descr
new file mode 100644
index 000000000000..4c488ddee0ca
--- /dev/null
+++ b/mail/zabit/pkg-descr
@@ -0,0 +1,18 @@
+Almost anyone would agree that the most prominent problem
+facing mail server administrators is spam mails.
+For that we've decided to code a program which
+will be able to detect and reject spam before the mail gets queued.
+
+Zabit is a content/attachment filter for qmail.
+It's been coded in C language for performance reasons.
+
+Zabit does content filtering and attachment control.
+
+Project Page:
+WWW: http://www.enderunix.org/zabit
+
+Author: 
+   Necati Ersen SISECI
+  siseci@enderunix.org
+ EnderUNIX SDT @ Turkey
+http://www.enderunix.org/
diff --git a/mail/zabit/pkg-plist b/mail/zabit/pkg-plist
new file mode 100644
index 000000000000..c98013a0845e
--- /dev/null
+++ b/mail/zabit/pkg-plist
@@ -0,0 +1,4 @@
+etc/zabit.conf
+etc/zabit-attach.conf
+etc/zabit-disattach.conf
+bin/zabit