diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index a93ec612a8e..852800136d7 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2006/04/26 15:37:24 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2006/08/01 18:22:05 alek Exp $
 
 COMMENT=		"enhanced, MIME capable Berkeley Mail"
 
-V=			12.0
+V=			12.1
 DISTNAME=		mailx-${V}
 PKGNAME=		nail-${V}
 CATEGORIES=		mail
diff --git a/mail/nail/distinfo b/mail/nail/distinfo
index 9e53685e3b1..231c94dcfc0 100644
--- a/mail/nail/distinfo
+++ b/mail/nail/distinfo
@@ -1,4 +1,4 @@
-MD5 (mailx-12.0.tar.bz2) = 67e8236a73f8a2d85c45cf8a2bdf7af1
-RMD160 (mailx-12.0.tar.bz2) = d25b4fc9653d1913cde28ef7427e7820c7075a81
-SHA1 (mailx-12.0.tar.bz2) = fff06851602b8fa5fde633a63880ac7059ec671e
-SIZE (mailx-12.0.tar.bz2) = 268247
+MD5 (mailx-12.1.tar.bz2) = b78962f9384a9134adeb9ba1619aa6da
+RMD160 (mailx-12.1.tar.bz2) = 2c3aa4c8b99f31e11b7a130a7dca4cd49e5d3493
+SHA1 (mailx-12.1.tar.bz2) = 99769c0b4f8b3f95942e50dabacd43a3d890dc32
+SIZE (mailx-12.1.tar.bz2) = 268853
diff --git a/mail/nail/patches/patch-mailx_1 b/mail/nail/patches/patch-mailx_1
index 8c213675b5d..adaf6f4712f 100644
--- a/mail/nail/patches/patch-mailx_1
+++ b/mail/nail/patches/patch-mailx_1
@@ -1,12 +1,9 @@
-$OpenBSD: patch-mailx_1,v 1.1 2006/04/26 15:37:25 naddy Exp $
---- mailx.1.orig	Mon Apr 24 10:34:31 2006
-+++ mailx.1	Mon Apr 24 10:42:37 2006
-@@ -36,14 +36,14 @@
+$OpenBSD: patch-mailx_1,v 1.2 2006/08/01 18:22:05 alek Exp $
+--- mailx.1.orig	Mon Mar  6 15:23:24 2006
++++ mailx.1	Tue Aug  1 10:23:50 2006
+@@ -38,12 +38,12 @@
  .\"
- .\"     Sccsid: @(#)mailx.1	2.317 (gritter) 3/4/06
- .\"
--.TH MAILX 1 "3/4/06" "mailx 12.0" "User Commands"
-+.TH MAILX 1 "3/4/06" "nail 12.0" "User Commands"
+ .TH MAILX 1 "3/6/06" "Heirloom mailx 12.1" "User Commands"
  .SH NAME
 -mailx \- send and receive Internet mail
 +nail \- send and receive Internet mail