diff --git a/mail/mutt/stable/Makefile b/mail/mutt/stable/Makefile
index 5fee130c09b..1657d62d793 100644
--- a/mail/mutt/stable/Makefile
+++ b/mail/mutt/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2002/01/11 01:44:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2002/01/23 19:41:29 fgsch Exp $
 
 COMMENT=	"tty-based e-mail client"
 
@@ -24,7 +24,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FLAVORS=	slang imap pop mixmaster compressed
+FLAVORS=	slang mixmaster compressed
 FLAVOR?=
 
 SYSCONFDIR=	/etc/mutt
@@ -32,7 +32,8 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--with-sharedir="${PREFIX}/share/mutt" \
 		--with-docdir="${PREFIX}/share/doc/mutt" \
 		--enable-flock --disable-fcntl \
-		--enable-external_dotlock
+		--enable-external_dotlock \
+		--enable-imap --enable-pop --with-ssl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		ISPELL="${LOCALBASE}/bin/ispell"
@@ -54,18 +55,6 @@ CONFIGURE_ARGS+= --enable-compressed
 SUPDISTFILES+=	patch-${VERSION}.rr.compressed.1.gz:0
 .endif
 
-# If you need IMAP or POP, you may want to enable those.
-.if ${FLAVOR:L:Mimap}
-CONFIGURE_ARGS+= --enable-imap --with-ssl
-.endif
-
-# Note: The POP3 support is there only for convenience, and it's rather
-# limited.  If you need more functionality you should consider using a
-# specialized program, such as fetchmail.
-.if ${FLAVOR:L:Mpop}
-CONFIGURE_ARGS+= --enable-pop
-.endif
-
 .if ${FLAVOR:L:Mmixmaster}
 CONFIGURE_ARGS+=       --with-mixmaster="${LOCALBASE}/sbin/mixmaster"
 RUN_DEPENDS+=          ::mail/mixmaster
diff --git a/mail/mutt/stable/pkg/DESCR b/mail/mutt/stable/pkg/DESCR
index dd4ada23ba6..e859cf2e7c6 100644
--- a/mail/mutt/stable/pkg/DESCR
+++ b/mail/mutt/stable/pkg/DESCR
@@ -16,8 +16,6 @@ Other features include:
 
 Flavors:
 	slang	   - build using the S-Lang library for screen handling.
-	imap	   - build with IMAP & SSL support.
-	pop	   - build with POP3 support.
 	compressed - build with compressed folder support 
 		     (see: http://www.spinnaker.de/mutt/compressed/)
 	mixmaster  - build with anonymous remailing support.