diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index bb7fc16f106b..af1131c2d62d 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -48,6 +48,7 @@
 
 PORTNAME=	nmh
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mhost.com/pub/nmh/ \
 		${MASTER_SITE_LOCAL}
@@ -97,5 +98,11 @@ post-install:
 	@PKG_PREFIX='${PREFIX}' ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	chgrp mail ${PREFIX}/bin/inc
 	${CHMOD} g+s ${PREFIX}/bin/inc
+	for file in ${PREFIX}/etc/nmh/*.default ; do \
+		if [ \! -f $${file%%.default} ] ; then \
+			cp $$file $${file%%.default} ; \
+			chmod u+w $${file%%.default} ; \
+		fi \
+	done
 
 .include <bsd.port.mk>
diff --git a/mail/nmh/files/patch-ab b/mail/nmh/files/patch-ab
index 04e24b12f04a..3f54feabd3af 100644
--- a/mail/nmh/files/patch-ab
+++ b/mail/nmh/files/patch-ab
@@ -1,4 +1,4 @@
-diff -ur ../../nmh-1.0.2-DIST/Makefile.in ./Makefile.in
+diff -ur ../../nmh-1.0.4-DIST/Makefile.in ./Makefile.in
 --- ../../nmh-1.0.2-DIST/Makefile.in	Sun Sep 26 12:43:15 1999
 +++ ./Makefile.in	Sat Dec 11 11:54:28 1999
 @@ -65,6 +65,7 @@
@@ -10,9 +10,9 @@ diff -ur ../../nmh-1.0.2-DIST/Makefile.in ./Makefile.in
  
  .SUFFIXES:
 diff -ur ../../../nmh-1.0.3-DIST/etc/Makefile.in ./etc/Makefile.in
---- ../../../nmh-1.0.3-DIST/etc/Makefile.in	Thu Jan  6 13:30:07 2000
-+++ ./etc/Makefile.in	Mon Feb 28 10:20:34 2000
-@@ -20,6 +20,7 @@
+--- ../../../etc/Makefile.in.orig	Tue Mar 14 22:40:47 2000
++++ ./etc/Makefile.in	Tue Jun 19 13:47:33 2001
+@@ -22,6 +22,7 @@
  
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -20,7 +20,24 @@ diff -ur ../../../nmh-1.0.3-DIST/etc/Makefile.in ./etc/Makefile.in
  INSTALL_DATA    = @INSTALL_DATA@
  
  # Path to search for programs to handle MIME
-@@ -89,7 +90,7 @@
+@@ -78,29 +79,23 @@
+ install-files:
+ 	$(top_srcdir)/mkinstalldirs $(etcdir)
+ 	for file in $(DIST_FILES); do \
+-	  if [ -f $(etcdir)/$$file ]; then \
+-	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
+-	  fi; \
+-	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
++	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file.default; \
+ 	done
+ 	for file in $(GEN_FILES); do \
+-	  if [ -f $(etcdir)/$$file ]; then \
+-	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
+-	  fi; \
+-	  $(INSTALL_DATA) $$file $(etcdir)/$$file; \
++	  $(INSTALL_DATA) $$file $(etcdir)/$$file.default; \
+ 	done
+ 
  install-scripts:
  	$(top_srcdir)/mkinstalldirs $(bindir)
  	for script in $(SCRIPTS); do \
@@ -29,3 +46,11 @@ diff -ur ../../../nmh-1.0.3-DIST/etc/Makefile.in ./etc/Makefile.in
  	done
  
  uninstall: uninstall-files uninstall-scripts
+ 
+ uninstall-files:
+ 	for file in $(FILES); do \
+-	  rm -f $(etcdir)/$$file; \
++	  rm -f $(etcdir)/$$file.default; \
+ 	done
+ 
+ uninstall-scripts:
diff --git a/mail/nmh/pkg-plist b/mail/nmh/pkg-plist
index 1ccf5264b9ef..3e0a98e699e8 100644
--- a/mail/nmh/pkg-plist
+++ b/mail/nmh/pkg-plist
@@ -37,32 +37,32 @@ bin/sortm
 bin/viamail
 bin/whatnow
 bin/whom
-etc/nmh/MailAliases
-etc/nmh/components
-etc/nmh/digestcomps
-etc/nmh/distcomps
-etc/nmh/forwcomps
-etc/nmh/mhl.body
-etc/nmh/mhl.digest
-etc/nmh/mhl.format
-etc/nmh/mhl.forward
-etc/nmh/mhl.headers
-etc/nmh/mhl.reply
-etc/nmh/mhn.defaults
-etc/nmh/mts.conf
-etc/nmh/rcvdistcomps
-etc/nmh/rcvdistcomps.outbox
-etc/nmh/replcomps
-etc/nmh/replgroupcomps
-etc/nmh/scan.MMDDYY
-etc/nmh/scan.YYYYMMDD
-etc/nmh/scan.default
-etc/nmh/scan.mailx
-etc/nmh/scan.nomime
-etc/nmh/scan.size
-etc/nmh/scan.time
-etc/nmh/scan.timely
-etc/nmh/scan.unseen
+etc/nmh/MailAliases.default
+etc/nmh/components.default
+etc/nmh/digestcomps.default
+etc/nmh/distcomps.default
+etc/nmh/forwcomps.default
+etc/nmh/mhl.body.default
+etc/nmh/mhl.digest.default
+etc/nmh/mhl.format.default
+etc/nmh/mhl.forward.default
+etc/nmh/mhl.headers.default
+etc/nmh/mhl.reply.default
+etc/nmh/mhn.defaults.default
+etc/nmh/mts.conf.default
+etc/nmh/rcvdistcomps.default
+etc/nmh/rcvdistcomps.outbox.default
+etc/nmh/replcomps.default
+etc/nmh/replgroupcomps.default
+etc/nmh/scan.MMDDYY.default
+etc/nmh/scan.YYYYMMDD.default
+etc/nmh/scan.default.default
+etc/nmh/scan.mailx.default
+etc/nmh/scan.nomime.default
+etc/nmh/scan.size.default
+etc/nmh/scan.time.default
+etc/nmh/scan.timely.default
+etc/nmh/scan.unseen.default
 etc/nmh/tmac.h
 libexec/nmh/ap
 libexec/nmh/conflict