diff --git a/mail/Makefile b/mail/Makefile
index f773fb3944dc..49330c73a35a 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -112,7 +112,9 @@
     SUBDIR += emil
     SUBDIR += enigmail
     SUBDIR += enigmail-seamonkey
+    SUBDIR += enigmail-seamonkey2
     SUBDIR += enigmail-thunderbird
+    SUBDIR += enigmail-thunderbird3
     SUBDIR += enma
     SUBDIR += eps
     SUBDIR += epstools
diff --git a/mail/enigmail-seamonkey2/Makefile b/mail/enigmail-seamonkey2/Makefile
new file mode 100644
index 000000000000..6b4edffd4f9a
--- /dev/null
+++ b/mail/enigmail-seamonkey2/Makefile
@@ -0,0 +1,16 @@
+# New ports collection makefile for:	enigmail
+# Date created:			30 December 2009
+# Whom:				Alex Dupre <ale@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+COMMENT=	A GnuPG extension for the Seamonkey mail client
+
+MASTERDIR=	${.CURDIR}/../enigmail
+
+GECKO=		seamonkey2
+GECKO_PORTDIR=	www/${GECKO}
+GECKO_EXTDIR=	comm-1.9.1
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/enigmail-thunderbird3/Makefile b/mail/enigmail-thunderbird3/Makefile
new file mode 100644
index 000000000000..2277721146ea
--- /dev/null
+++ b/mail/enigmail-thunderbird3/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	enigmail
+# Date created:			30 December 2009
+# Whom:				Alex Dupre <ale@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+COMMENT=	A GnuPG extension for the Thunderbird mail client
+
+EXTRACT_DEPENDS=autoconf-2.13:${PORTSDIR}/devel/autoconf213
+
+MASTERDIR=	${.CURDIR}/../enigmail
+
+GECKO=		thunderbird3
+GECKO_PORTDIR=	mail/${GECKO}
+GECKO_EXTDIR=	comm-1.9.1
+
+.include "${MASTERDIR}/Makefile"