diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index ee5199c8e5c..57acdc153e0 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2002/10/27 16:59:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2003/12/03 17:22:50 sturm Exp $
 
 COMMENT=	"emacs interface to PGP and GnuPG"
 
@@ -16,12 +16,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE= gnu dest
 
-FLAVORS=	emacs emacs21 gnupg pgp pgp5 xemacs
-FLAVOR?=	emacs gnupg
+FLAVORS=	emacs21 gnupg pgp pgp5 xemacs
+FLAVOR?=	emacs21 gnupg
 
-.if ${FLAVOR:L:Memacs}
-BUILD_DEPENDS=	:emacs-20.*:editors/emacs
-.elif ${FLAVOR:L:Memacs21}
+.if ${FLAVOR:L:Memacs21}
 BUILD_DEPENDS=	:emacs-21.*:editors/emacs21
 .endif
 
diff --git a/mail/mailcrypt/pkg/DESCR b/mail/mailcrypt/pkg/DESCR
index 3fac3c0da17..e2a8d27d6b3 100644
--- a/mail/mailcrypt/pkg/DESCR
+++ b/mail/mailcrypt/pkg/DESCR
@@ -6,8 +6,5 @@ Flavors:
 	pgp	- use PGP 2.x
 	pgp5	- use PGP 5.x
 	gnupg	- use GNU Privacy Guard
-	emacs	- use GNU Emacs 20.x
 	emacs21 - use GNU Emacs 21.x
 	xemacs	- use XEmacs
-
-WWW: ${HOMEPAGE}