diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index ef525bc7c51f..a15c394fd178 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -5,7 +5,6 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
 PKGNAMESUFFIX=	-thunderbird
 
 COMMENT=	A GnuPG extension for the Thunderbird mail client
diff --git a/mail/enigmail-thunderbird/pkg-message b/mail/enigmail-thunderbird/pkg-message
new file mode 100644
index 000000000000..97a810299624
--- /dev/null
+++ b/mail/enigmail-thunderbird/pkg-message
@@ -0,0 +1,2 @@
+If you upgraded Thunderbird from a previous release you have to locate
+your user profile directory and delete the file XUL.mfasl.
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index 799fb3371e42..b8a4c1ce444f 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -6,11 +6,16 @@
 #
 
 PORTNAME=	enigmail
-PORTVERSION=	0.83.6
+PORTVERSION=	0.84.0
 PORTREVISION?=	0
 CATEGORIES=	mail security
-MASTER_SITES=	http://mozdev.secsup.org/enigmail/src/ \
-		http://downloads.us-east3.mozdev.org/enigmail/src/
+MASTER_SITES=	http://www.brunschwig.net/enigmail/src/ \
+		http://mozdev.secsup.org/enigmail/src/ \
+		http://downloads.us-east3.mozdev.org/enigmail/src/ \
+		http://mozdev.oregonstate.edu/enigmail/src/ \
+		http://mozdev.sweetooth.org/enigmail/src/ \
+		http://ftp.heanet.ie/pub/mozdev/enigmail/src/ \
+		http://mirror.meisterwerk.net/rmozdev/enigmail/src/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		ipc-1.0.5${EXTRACT_SUFX}
 
@@ -20,6 +25,8 @@ COMMENT?=	A GnuPG extension for the Mozilla mail client
 EXTRACT_DEPENDS?=	${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla/Makefile:${PORTSDIR}/${LOCAL_SRCDIR}:configure
 RUN_DEPENDS?=	mozilla:${PORTSDIR}/${LOCAL_SRCDIR}
 
+RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -71,5 +78,6 @@ do-install:
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo
index 521986d31145..c48bd6d73c59 100644
--- a/mail/enigmail/distinfo
+++ b/mail/enigmail/distinfo
@@ -1,4 +1,4 @@
-MD5 (enigmail-0.83.6.tar.gz) = fe851d3a95cb32a906a3e6cb6b4b5552
-SIZE (enigmail-0.83.6.tar.gz) = 281677
+MD5 (enigmail-0.84.0.tar.gz) = f51e9aade0694cad3c49dd84ca1acd24
+SIZE (enigmail-0.84.0.tar.gz) = 307810
 MD5 (ipc-1.0.5.tar.gz) = 457f8277b12f3e37defa71dc186f83b4
 SIZE (ipc-1.0.5.tar.gz) = 137083
diff --git a/mail/enigmail/pkg-message b/mail/enigmail/pkg-message
new file mode 100644
index 000000000000..47d56ef38e66
--- /dev/null
+++ b/mail/enigmail/pkg-message
@@ -0,0 +1,2 @@
+You have to delete/rebuild the shared Mozilla component database (compreg.dat)
+as root in order to use enigmail.