diff --git a/mail/Makefile b/mail/Makefile
index 0a97603eb07e..b2a3a4297a47 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -60,6 +60,7 @@
     SUBDIR += emh-emacs20
     SUBDIR += emh-xemacs21-mule
     SUBDIR += emil
+    SUBDIR += enigmail
     SUBDIR += esmtp
     SUBDIR += evolution
     SUBDIR += exact
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
new file mode 100644
index 000000000000..b422ba84e024
--- /dev/null
+++ b/mail/enigmail/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:	enigmail
+# Date created:			20 January 2004
+# Whom:				Alex Dupre <ale@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	enigmail
+PORTVERSION=	0.83.1
+CATEGORIES=	mail security
+MASTER_SITES=	http://mozdev.secsup.org/enigmail/src/ \
+		http://downloads.us-east3.mozdev.org/enigmail/src/
+DISTFILES=	${PORTNAME}-${PORTVERSION:S/.1//}.latest${EXTRACT_SUFX} \
+		ipc-1.0.5${EXTRACT_SUFX}
+
+MAINTAINER=	ale@FreeBSD.org
+COMMENT?=	A GnuPG extension for the Mozilla mail client
+
+EXTRACT_DEPENDS?=	${WRKSRC}/Makefile:${LOCAL_SRCDIR}:configure
+RUN_DEPENDS?=	mozilla:${LOCAL_SRCDIR}
+
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+
+WRKSRC=		${WRKDIR}/mozilla
+LOCAL_SRCDIR?=	${PORTSDIR}/www/mozilla
+LOCAL_SUBDIR?=	lib/mozilla
+LOCAL_PREFIX=	${PREFIX}/${LOCAL_SUBDIR}
+
+COMPONENTS=	ipc.xpt enigmime.xpt libenigmime.so enigmail.xpt enigmail.js enigprefs-service.js
+CHROME=		enigmail.jar enigmail-skin.jar enigmail-skin-tbird.jar
+
+PLIST_SUB=	LOCAL_SUBDIR=${LOCAL_SUBDIR}
+
+MAKE:=		${MAKE} WRKDIR=${WRKDIR}
+
+do-extract:
+	@for file in ${EXTRACT_ONLY}; do \
+		cd ${WRKSRC}/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \
+	done
+
+do-build:
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} export)
+	@(cd ${WRKSRC}/modules/libreg; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
+	@(cd ${WRKSRC}/xpcom/string; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
+	@(cd ${WRKSRC}/xpcom; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
+	@(cd ${WRKSRC}/xpcom/obsolete; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
+	@(cd ${WRKSRC}/extensions/ipc; ./makemake -r; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS});
+	@(cd ${WRKSRC}/extensions/enigmail; ./makemake -r; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS});
+
+do-install:
+	@for file in ${COMPONENTS}; do \
+		${INSTALL_DATA} ${WRKSRC}/dist/bin/components/$$file ${LOCAL_PREFIX}/components; \
+	done
+	@for file in ${CHROME}; do \
+		${INSTALL_DATA} ${WRKSRC}/dist/bin/chrome/$$file ${LOCAL_PREFIX}/chrome; \
+	done
+
+post-install:
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.mk>
diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo
new file mode 100644
index 000000000000..34c9bbaecd0b
--- /dev/null
+++ b/mail/enigmail/distinfo
@@ -0,0 +1,2 @@
+MD5 (enigmail-0.83.latest.tar.gz) = e610a90fccd3ce706e92b9d113eb86ac
+MD5 (ipc-1.0.5.tar.gz) = 457f8277b12f3e37defa71dc186f83b4
diff --git a/mail/enigmail/pkg-deinstall b/mail/enigmail/pkg-deinstall
new file mode 100644
index 000000000000..f3078aa9385e
--- /dev/null
+++ b/mail/enigmail/pkg-deinstall
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if test "$2" = "POST-DEINSTALL"; then
+FILE=${PKG_PREFIX}/lib/mozilla/chrome/installed-chrome.txt
+cp ${FILE} ${FILE}.orig
+cat ${FILE}.orig | grep -v enigmail > ${FILE}
+rm ${FILE}.orig
+fi
diff --git a/mail/enigmail/pkg-descr b/mail/enigmail/pkg-descr
new file mode 100644
index 000000000000..eaeab702bf1b
--- /dev/null
+++ b/mail/enigmail/pkg-descr
@@ -0,0 +1,13 @@
+Enigmail is an extension to the mail client of Mozilla / Thunderbird
+which allows users to access the authentication and encryption features
+provided by the popular GnuPG software.
+
+Enigmail can encrypt/sign mail when sending, and also decrypt/authenticate
+received mail. It can also import/export public keys. Enigmail supports
+both the inline PGP format, and the PGP/MIME format (RFC 3156), which can
+be used to encrypt attachments.
+
+WWW: http://enigmail.mozdev.org/
+
+- Alex Dupre
+ale@FreeBSD.org
diff --git a/mail/enigmail/pkg-install b/mail/enigmail/pkg-install
new file mode 100644
index 000000000000..c90d8db53b1e
--- /dev/null
+++ b/mail/enigmail/pkg-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if test "$2" = "POST-INSTALL"; then
+cat << EOF >> ${PKG_PREFIX}/lib/mozilla/chrome/installed-chrome.txt
+content,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/
+skin,install,url,jar:resource:/chrome/enigmail-skin.jar!/skin/modern/enigmail/
+skin,install,url,jar:resource:/chrome/enigmail-skin.jar!/skin/classic/enigmail/
+locale,install,url,jar:resource:/chrome/enigmail.jar!/locale/en-US/enigmail/
+EOF
+fi
diff --git a/mail/enigmail/pkg-plist b/mail/enigmail/pkg-plist
new file mode 100644
index 000000000000..b81c501e2b65
--- /dev/null
+++ b/mail/enigmail/pkg-plist
@@ -0,0 +1,9 @@
+%%LOCAL_SUBDIR%%/components/ipc.xpt
+%%LOCAL_SUBDIR%%/components/enigmime.xpt
+%%LOCAL_SUBDIR%%/components/libenigmime.so
+%%LOCAL_SUBDIR%%/components/enigmail.xpt
+%%LOCAL_SUBDIR%%/components/enigmail.js
+%%LOCAL_SUBDIR%%/components/enigprefs-service.js
+%%LOCAL_SUBDIR%%/chrome/enigmail.jar
+%%LOCAL_SUBDIR%%/chrome/enigmail-skin.jar
+%%LOCAL_SUBDIR%%/chrome/enigmail-skin-tbird.jar