diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 4f5891242fbe..2bec96dc8bdf 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nail
-PORTVERSION=	9.23
+PORTVERSION=	9.25
 CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
diff --git a/mail/heirloom-mailx/distinfo b/mail/heirloom-mailx/distinfo
index 5bb4c67072e8..55024aebe8ff 100644
--- a/mail/heirloom-mailx/distinfo
+++ b/mail/heirloom-mailx/distinfo
@@ -1 +1 @@
-MD5 (nail-9.23.tar.gz) = 275573f67597632d14c36001a5e3345e
+MD5 (nail-9.25.tar.gz) = 82127b577bc66298085181499250d93c
diff --git a/mail/heirloom-mailx/files/patch-aa b/mail/heirloom-mailx/files/patch-aa
index 2713ffdd7b2f..638d3b91a9a8 100644
--- a/mail/heirloom-mailx/files/patch-aa
+++ b/mail/heirloom-mailx/files/patch-aa
@@ -1,9 +1,9 @@
---- mime.c.orig	Fri Dec 29 14:32:43 2000
-+++ mime.c	Fri Dec 29 14:32:57 2000
-@@ -150,7 +150,7 @@
- 		if ((wl = mbstowcs(w, t, LINESIZE)) == -1)
+--- mime.c.orig	Thu Jan 25 08:36:11 2001
++++ mime.c	Thu Feb  1 01:50:57 2001
+@@ -179,7 +179,7 @@
+ 		if ((sz = xmbstowcs(w, t, LINESIZE)) == -1)
  			return;
- 		for (p = w, i = 0; *p && i < wl; p++, i++) {
+ 		for (p = w, i = 0; *p && i < sz; p++, i++) {
 -			if (!iswprint(*p) && *p != '\n' && *p != '\r'
 +			if (!isprint(*p) && *p != '\n' && *p != '\r'
  					&& *p != '\b' && *p != '\t')
diff --git a/mail/heirloom-mailx/pkg-descr b/mail/heirloom-mailx/pkg-descr
index 42d27213389f..49dcf73bbaff 100644
--- a/mail/heirloom-mailx/pkg-descr
+++ b/mail/heirloom-mailx/pkg-descr
@@ -1 +1,3 @@
 BSD mail utility with MIME extensions
+
+WWW: http://omnibus.ruf.uni-freiburg.de/~gritter/
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 4f5891242fbe..2bec96dc8bdf 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nail
-PORTVERSION=	9.23
+PORTVERSION=	9.25
 CATEGORIES=	mail
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/nail/
 
diff --git a/mail/nail/distinfo b/mail/nail/distinfo
index 5bb4c67072e8..55024aebe8ff 100644
--- a/mail/nail/distinfo
+++ b/mail/nail/distinfo
@@ -1 +1 @@
-MD5 (nail-9.23.tar.gz) = 275573f67597632d14c36001a5e3345e
+MD5 (nail-9.25.tar.gz) = 82127b577bc66298085181499250d93c
diff --git a/mail/nail/files/patch-aa b/mail/nail/files/patch-aa
index 2713ffdd7b2f..638d3b91a9a8 100644
--- a/mail/nail/files/patch-aa
+++ b/mail/nail/files/patch-aa
@@ -1,9 +1,9 @@
---- mime.c.orig	Fri Dec 29 14:32:43 2000
-+++ mime.c	Fri Dec 29 14:32:57 2000
-@@ -150,7 +150,7 @@
- 		if ((wl = mbstowcs(w, t, LINESIZE)) == -1)
+--- mime.c.orig	Thu Jan 25 08:36:11 2001
++++ mime.c	Thu Feb  1 01:50:57 2001
+@@ -179,7 +179,7 @@
+ 		if ((sz = xmbstowcs(w, t, LINESIZE)) == -1)
  			return;
- 		for (p = w, i = 0; *p && i < wl; p++, i++) {
+ 		for (p = w, i = 0; *p && i < sz; p++, i++) {
 -			if (!iswprint(*p) && *p != '\n' && *p != '\r'
 +			if (!isprint(*p) && *p != '\n' && *p != '\r'
  					&& *p != '\b' && *p != '\t')
diff --git a/mail/nail/pkg-descr b/mail/nail/pkg-descr
index 42d27213389f..49dcf73bbaff 100644
--- a/mail/nail/pkg-descr
+++ b/mail/nail/pkg-descr
@@ -1 +1,3 @@
 BSD mail utility with MIME extensions
+
+WWW: http://omnibus.ruf.uni-freiburg.de/~gritter/