diff -ru mail/mutt-devel/distinfo mail/mutt-devel.nntp/distinfo
--- mail/mutt-devel/distinfo	2006-08-28 13:08:43.000000000 +0200
+++ mail/mutt-devel.nntp/distinfo	2006-10-19 23:41:58.000000000 +0200
@@ -6,9 +6,17 @@
 SHA1 (patch-1.5.13.rr.compressed.1.gz) = f8a999d79a1c89db7caa6e99028b8f4b65eef29d
 RMD160 (patch-1.5.13.rr.compressed.1.gz) = 2808b8935616d4ec6c1ebdd7710ab6219da655f1
 Size (patch-1.5.13.rr.compressed.1.gz) = 10517 bytes
+SHA1 (patch-1.5.13.vvv.nntp.gz) = ce67dcc2f59a709553b626ed93c12cf68f7e8551
+RMD160 (patch-1.5.13.vvv.nntp.gz) = 41cd960f9c7d8522cc96fd2a9a5af8bcb4fea33b
+Size (patch-1.5.13.vvv.nntp.gz)) = 54834 bytes
+SHA1 (patch-ac-nntp) = 05b5861e76190e579bdb0eba004cd46f57725be1
+RMD160 (patch-ac-nntp) = b6d1a14c3c05438f0f1d354ee06919d4fc6ead69
+Size (patch-ac-nntp) = 562 bytes
+SHA1 (patch-ac) = b0181b2683baa8ecc835929092b928c897c11494
+RMD160 (patch-ac) = 9630d3c52a4dba7669be96c1c5f5d3f9d45f81e4
+Size (patch-ac) = 487 bytes
 SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
 SHA1 (patch-ab) = 67e0deb5af56830397d897979ac806f9c16fdbda
-SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
 SHA1 (patch-ad) = ecfa994c7c5e494b6eb7356327b96de6559146fc
 SHA1 (patch-ag) = 84637d95fa9aa0cf58a6e6b2c82b783efa21cf66
 SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
diff -ru mail/mutt-devel/options.mk mail/mutt-devel.nntp/options.mk
--- mail/mutt-devel/options.mk	2006-10-18 22:31:34.000000000 +0200
+++ mail/mutt-devel.nntp/options.mk	2006-10-19 23:50:02.000000000 +0200
@@ -5,7 +5,7 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mutt
 PKG_OPTIONS_REQUIRED_GROUPS=	display
 PKG_OPTIONS_GROUP.display=	slang ncurses ncursesw curses
-PKG_SUPPORTED_OPTIONS=	ssl sasl mutt-hcache idn mutt-compressed-mbox debug
+PKG_SUPPORTED_OPTIONS=	ssl sasl mutt-hcache idn mutt-compressed-mbox nntp debug
 PKG_SUGGESTED_OPTIONS=	ssl curses
 
 .include "../../mk/bsd.options.mk"
@@ -103,6 +103,33 @@
 .endif
 
 ###
+### NNTP support
+###
+.if !empty(PKG_OPTIONS:Mnntp)
+PATCH_SITES+=		http://mutt.org.ua/download/mutt-1.5.13/
+PATCHFILES+=		patch-1.5.13.vvv.nntp.gz
+PATCH_DIST_STRIP.patch-1.5.13.vvv.nntp.gz=-p1
+PATCH_SITES+=		http://salmi.ch/~jukka/patches/pkgsrc/mail/mutt-devel/
+PATCHFILES+=		patch-ac-nntp
+CONFIGURE_ARGS+=	--enable-nntp
+pre-configure:
+	cd ${WRKSRC};				\
+	# XXX hack:				\
+	export PATH=/usr/pkg/bin:$$PATH;	\
+	aclocal -I m4;				\
+	autoheader;				\
+	cd m4;					\
+	rm -f Makefile.am;			\
+	make -f Makefile.am.in;			\
+	cd ..;					\
+	automake --foreign;			\
+	autoconf;
+.else
+PATCH_SITES+=		http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/mail/mutt-devel/patches/
+PATCHFILES+=		patch-ac
+.endif
+
+###
 ### Enable debugging support
 ###
 .if !empty(PKG_OPTIONS:Mdebug)
Only in mail/mutt-devel/patches: patch-ac