diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index cc7bb142fb45..cfba3e0d2df9 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -6,8 +6,8 @@
 #
 # $FreeBSD$
 
-DISTNAME=	mutt-0.95.7i
-PKGNAME=	mutt-0.95.7
+DISTNAME=	mutt-1.0pre1i
+PKGNAME=	mutt-1.0b1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
 		ftp://ftp.uib.no/pub/mutt/  \
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=	--with-slang=${PREFIX}
 .elif defined(USE_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 MAN1=		mutt.1 mutt_dotlock.1
 
 post-patch:
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 77f90763d94d..999b4c50339d 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.95.7i.tar.gz) = 9ba7a6b4365f4be3e78d428ff4f65a2d
+MD5 (mutt/mutt-1.0pre1i.tar.gz) = afbb2942b7af0021043c53a691ff2d75
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index b4b603f2c42d..60c0be27c14d 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -166,6 +166,14 @@ share/locale/it/LC_MESSAGES/mutt.mo
 share/locale/es/LC_MESSAGES/mutt.mo
 share/locale/uk/LC_MESSAGES/mutt.mo
 share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/pl/LC_MESSAGES/mutt.mo
+share/locale/nl/LC_MESSAGES/mutt.mo
+share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/id/LC_MESSAGES/mutt.mo
+share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/ko/LC_MESSAGES/mutt.mo
+share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 share/doc/mutt/manual.txt
 share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/sample.muttrc
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index cc7bb142fb45..cfba3e0d2df9 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -6,8 +6,8 @@
 #
 # $FreeBSD$
 
-DISTNAME=	mutt-0.95.7i
-PKGNAME=	mutt-0.95.7
+DISTNAME=	mutt-1.0pre1i
+PKGNAME=	mutt-1.0b1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
 		ftp://ftp.uib.no/pub/mutt/  \
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=	--with-slang=${PREFIX}
 .elif defined(USE_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 MAN1=		mutt.1 mutt_dotlock.1
 
 post-patch:
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 77f90763d94d..999b4c50339d 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.95.7i.tar.gz) = 9ba7a6b4365f4be3e78d428ff4f65a2d
+MD5 (mutt/mutt-1.0pre1i.tar.gz) = afbb2942b7af0021043c53a691ff2d75
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index b4b603f2c42d..60c0be27c14d 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -166,6 +166,14 @@ share/locale/it/LC_MESSAGES/mutt.mo
 share/locale/es/LC_MESSAGES/mutt.mo
 share/locale/uk/LC_MESSAGES/mutt.mo
 share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/pl/LC_MESSAGES/mutt.mo
+share/locale/nl/LC_MESSAGES/mutt.mo
+share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/id/LC_MESSAGES/mutt.mo
+share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/ko/LC_MESSAGES/mutt.mo
+share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 share/doc/mutt/manual.txt
 share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/sample.muttrc
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index cc7bb142fb45..cfba3e0d2df9 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -6,8 +6,8 @@
 #
 # $FreeBSD$
 
-DISTNAME=	mutt-0.95.7i
-PKGNAME=	mutt-0.95.7
+DISTNAME=	mutt-1.0pre1i
+PKGNAME=	mutt-1.0b1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
 		ftp://ftp.uib.no/pub/mutt/  \
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=	--with-slang=${PREFIX}
 .elif defined(USE_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 MAN1=		mutt.1 mutt_dotlock.1
 
 post-patch:
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index 77f90763d94d..999b4c50339d 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-0.95.7i.tar.gz) = 9ba7a6b4365f4be3e78d428ff4f65a2d
+MD5 (mutt/mutt-1.0pre1i.tar.gz) = afbb2942b7af0021043c53a691ff2d75
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index b4b603f2c42d..60c0be27c14d 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -166,6 +166,14 @@ share/locale/it/LC_MESSAGES/mutt.mo
 share/locale/es/LC_MESSAGES/mutt.mo
 share/locale/uk/LC_MESSAGES/mutt.mo
 share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/pl/LC_MESSAGES/mutt.mo
+share/locale/nl/LC_MESSAGES/mutt.mo
+share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/id/LC_MESSAGES/mutt.mo
+share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/ko/LC_MESSAGES/mutt.mo
+share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 share/doc/mutt/manual.txt
 share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/sample.muttrc