diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
new file mode 100644
index 00000000000..b598b719be1
--- /dev/null
+++ b/mail/enigmail/Makefile
@@ -0,0 +1,58 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2006/10/03 21:10:16 steven Exp $
+
+.if ${MACHINE_ARCH} == "sparc64"
+BROKEN=		"Thunderbird hangs when accessing items from the OpenPGP menu"
+.endif
+
+COMMENT=	"GnuPG extension for Thunderbird"
+
+VER=		0.94.1
+DISTNAME=	enigmail-${VER}
+CATEGORIES=	mail security
+
+HOMEPAGE=	http://enigmail.mozdev.org/
+
+# mozilla public license or GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=	http://www.mozilla-enigmail.org/downloads/src/
+
+THUNDERBIRD_DIR=mail/mozilla-thunderbird
+BUILD_DEPENDS=	::${THUNDERBIRD_DIR}:configure
+RUN_DEPENDS=	:mozilla-thunderbird->=1.5:${THUNDERBIRD_DIR} \
+		::security/gnupg
+
+USE_X11=	Yes
+USE_GMAKE=	Yes
+NO_REGRESS=	Yes
+SUBST_VARS=	VER ENIGMAIL_XPI GNU_ARCH
+
+MOZBASE=	${WRKDIR}/${THUNDERBIRD_DIR}/mozilla
+MOZBIN=		${MOZBASE}/dist/bin
+WRKDIST=	${WRKDIR}/enigmail
+WRKSRC=		${MOZBASE}/mailnews/extensions/enigmail
+
+GNU_ARCH=	${MACHINE_ARCH:S/amd64/x86_64/}
+ENIGMAIL_XPI=	${DISTNAME}-${OPSYS:L}-${GNU_ARCH}.xpi
+
+post-extract:
+	@mv ${WRKDIST} ${MOZBASE}/mailnews/extensions
+
+do-build:
+	@cd ${MOZBASE} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} export
+	@cd ${MOZBASE}/modules/libreg && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+	@cd ${MOZBASE}/xpcom/string && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+	@cd ${MOZBASE}/xpcom && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+	@cd ${MOZBASE}/xpcom/obsolete && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+	@cd ${WRKSRC} && ./makemake -r
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
+
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/enigmail
+	${INSTALL_DATA} ${MOZBIN}/${ENIGMAIL_XPI} ${PREFIX}/share/enigmail
+
+.include <bsd.port.mk>
diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo
new file mode 100644
index 00000000000..25fa7747a83
--- /dev/null
+++ b/mail/enigmail/distinfo
@@ -0,0 +1,4 @@
+MD5 (enigmail-0.94.1.tar.gz) = b255e7a77ecea435934bfa1872e99f6a
+RMD160 (enigmail-0.94.1.tar.gz) = 1b8719c7669449f706bd3ff6964565e6ba9f8902
+SHA1 (enigmail-0.94.1.tar.gz) = d507757c065b607edecd193406ad60fcb7a67ace
+SIZE (enigmail-0.94.1.tar.gz) = 513084
diff --git a/mail/enigmail/pkg/DESCR b/mail/enigmail/pkg/DESCR
new file mode 100644
index 00000000000..195254af2b2
--- /dev/null
+++ b/mail/enigmail/pkg/DESCR
@@ -0,0 +1,3 @@
+Enigmail is an extension to the mail client of Mozilla/Netscape and
+Mozilla Thunderbird which allows users to access the authentication and
+encryption features provided by GnuPG.
diff --git a/mail/enigmail/pkg/MESSAGE b/mail/enigmail/pkg/MESSAGE
new file mode 100644
index 00000000000..c0e9fb029bf
--- /dev/null
+++ b/mail/enigmail/pkg/MESSAGE
@@ -0,0 +1,3 @@
+To activate the Enigmail extension, users should install the file
+${PREFIX}/share/enigmail/${ENIGMAIL_XPI}
+into their own profile via the menu: Tools -> Extensions -> Install
diff --git a/mail/enigmail/pkg/PLIST b/mail/enigmail/pkg/PLIST
new file mode 100644
index 00000000000..d60e637cecc
--- /dev/null
+++ b/mail/enigmail/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/03 21:10:16 steven Exp $
+share/enigmail/
+share/enigmail/enigmail-${VER}-openbsd-${GNU_ARCH}.xpi