diff --git a/mutt-ng/Makefile b/mutt-ng/Makefile
index d93ef7ccff..683039a6df 100644
--- a/mutt-ng/Makefile
+++ b/mutt-ng/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.6 2005/07/09 19:51:28 christian_gall Exp $
-# $NetBSD: Makefile,v 1.6 2005/07/09 19:51:28 christian_gall Exp $
+# $Id: Makefile,v 1.7 2005/07/21 14:15:43 christian_gall Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/21 14:15:43 christian_gall Exp $
 
-DISTNAME=	muttng-20050709
+DISTNAME=	muttng-20050721
 CATEGORIES=	mail
 MASTER_SITES=	http://nion.modprobe.de/mutt-ng/snapshots/
 
@@ -17,6 +17,9 @@ REPLACE_PERL+=		smime_keys.pl
 REPLACE_PERL+=		contrib/update-config.pl
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/muttng/ \
 			--enable-pop --enable-imap --with-slang
+AUTOCONF_REQD=		2.50
+USE_TOOLS+=		gmake autoconf automake
+
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.muttng
 PKG_SUPPORTED_OPTIONS=	ssl gpgme sasl2 idn esmtp hcache gssapi
@@ -61,6 +64,9 @@ CONFIGURE_ARGS+=	--enable-hcache --with-bdb --without-qdbm --without-gdbm
 .include "../../databases/db4/buildlink3.mk"
 .endif
 
+pre-configure:
+	cd ${WRKSRC}; ./autogen.sh
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/libslang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mutt-ng/distinfo b/mutt-ng/distinfo
index 3d7fc243bb..80646c21c4 100644
--- a/mutt-ng/distinfo
+++ b/mutt-ng/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/07/09 19:50:16 christian_gall Exp $
+$NetBSD: distinfo,v 1.5 2005/07/21 14:15:43 christian_gall Exp $
 
-SHA1 (muttng-20050709.tar.gz) = 160b025cabca813735650a762018af2ae88527fa
-RMD160 (muttng-20050709.tar.gz) = b344c66432269de7bf44056b80853b841aa56dd8
-Size (muttng-20050709.tar.gz) = 2270101 bytes
+SHA1 (muttng-20050721.tar.gz) = 4307c186bba743fb9a2f276b91df960da0420a00
+RMD160 (muttng-20050721.tar.gz) = 3f4868be5ed7bb827a9300c3fba318f578f3e170
+Size (muttng-20050721.tar.gz) = 2191220 bytes
 SHA1 (patch-aa) = 0025694ae053f0f74e50ef0c0949ce018b7fda41
 SHA1 (patch-ab) = 98f102e7cad2a63fb8afc642047580d95fb8ce91