diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 2930e6e5614..d383caa91c5 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 1999/03/29 19:47:46 turan Exp $
+# $OpenBSD: Makefile,v 1.13 1999/04/02 00:37:50 turan Exp $
 
 DISTNAME=		mutt-0.95.4i
 CATEGORIES=     	mail
@@ -15,7 +15,7 @@ MASTER_SITES=		ftp://ftp.guug.de/pub/mutt/ \
 			ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ 
 
 GNU_CONFIGURE=		yes
-SYSCONFDIR=		${PREFIX}/etc
+SYSCONFDIR=		${PREFIX}/share/mutt
 CONFIGURE_ARGS=		--prefix=/usr/local \
 			--with-slang=/usr/local \
 			--with-docdir=/usr/local/share/doc/mutt \
@@ -27,8 +27,8 @@ LIB_DEPENDS=    slang.1.22:${PORTSDIR}/devel/libslang
 pre-fetch:
 	@${ECHO}
 	@${ECHO} '**********************************************************'
-	@${ECHO} '* This software contains cryptography enabling code.  It *'
-	@${ECHO} '* is illegal to export outside of the United States.     *'
+	@${ECHO} '* This software contains cryptographic enabling code.    *'
+	@${ECHO} '* It is illegal to export outside of the United States.  *'
 	@${ECHO} '**********************************************************'
 	@${ECHO}
 .endif
@@ -37,9 +37,8 @@ post-install:
 	strip ${PREFIX}/bin/mutt
 	@${ECHO} 
 	@${ECHO} '************************************************************'
-	@${ECHO} '* Remember to create or update Muttrc and mime.types       *'
-	@${ECHO} '* from the Muttrc.sample and mime.types.sample files which *'
-	@${ECHO} '* have been copied into the /usr/local/etc/ directory.     *'
+	@${ECHO} '* A sample muttrc and mime.types is available at           *'
+	@${ECHO} '* /usr/local/share/mutt/{Muttrc,mime.types}                *'
 	@${ECHO} '************************************************************'
 	@${ECHO}
 
diff --git a/mail/mutt/pkg/PLIST b/mail/mutt/pkg/PLIST
index e1d2891db83..f4fb92ef429 100644
--- a/mail/mutt/pkg/PLIST
+++ b/mail/mutt/pkg/PLIST
@@ -1,8 +1,6 @@
 bin/mutt
 man/man1/mutt.1
 man/man1/mutt_dotlock.1
-etc/Muttrc
-etc/mime.types
 share/doc/mutt/manual.txt
 share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/applying-patches.txt
@@ -184,7 +182,8 @@ share/mutt/charsets/t-61-8bit
 share/mutt/charsets/videotex-suppl
 share/mutt/charsets/charsets.alias.dist
 share/mutt/charsets/charsets.alias
+share/mutt/Muttrc
+share/mutt/mime.types
 @dirrm share/mutt/charsets
 @dirrm share/mutt
 @dirrm share/doc/mutt
-@dirrm etc