diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
index f159e0d..a86db99 100644
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -1,29 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX nmh-1.3-db5.patch 568 RMD160 4ecedcf484147ba74c296bf8675419948b45c586 SHA1 e7706a77ea8d065e48147929aca71a02e1939663 SHA256 b139def59d1c5371bec1a3b5067698bbb7c320771f66a703c7b8c9eb2f1bdf78
 AUX nmh-1.3-inc-login.patch 602 RMD160 22cd9b4062810b1d30e7d451f3c54b8ad065ce53 SHA1 ddd7152870068b57926a35695b836cc782874d87 SHA256 6f9991f2cacc05d11495d92813fa8000d415e5bf58fc2d194094897ff16f9dd2
 AUX nmh-1.3-install.patch 482 RMD160 db11b277c4c6e8ec124c94935405a035573eff76 SHA1 30e5f89d457fcc6a8075511e2e221e7f7313682c SHA256 b5f5ba018b71ee02ebc0618df1d1eb47a74214e7ff210975040a4f51619b0cfa
 AUX nmh-1.3-m_getfld.patch 624 RMD160 0723829e7a2138529f3e10df270c69e6f5ff6e80 SHA1 b84f27e4c7a84ce6260b0a8c857aff8997d6983d SHA256 733984fb6a763f1451e265c57aabb982cc788e13839497a3b5769875aa0cc2f5
 AUX nmh-1.3-parallelmake.patch 3121 RMD160 d743b48cb2c5bf7d5da9b2141ef0c0fd17221d54 SHA1 16943bc94e83c290ae9e7b7d2b3078a96c840a1a SHA256 befcdf3e2cec4eea23cccb3854cde3df8163282bfff84efce77c96fbdeae456c
+AUX nmh-1.5-inc-login.patch 640 RMD160 c78debf080e3ef038c1e065d2bd221e75c6e16a4 SHA1 6c00720685ae7bff25e04c22e4405fc5fd114518 SHA256 0d5181211b2dc56381128d5e66098b4615a3e679c6fa12c6800ff63e27bbc568
+AUX nmh-1.5-install.patch 644 RMD160 50007eacad1298ce0e9ecbe0a4eb8572d5d7675b SHA1 a4ff778b540f548aa5fe87927455854376ecd97f SHA256 086af362398a7610a59b23864cb66a5d0c0c146409b4f1989c015f14158fc331
 DIST nmh-1.3.tar.gz 847614 RMD160 a862789cc8edb28c0fc3295bd12787440797da92 SHA1 65b52b7db727c391cae7af60ee0b888cbdc2718a SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
+DIST nmh-1.5.tar.gz 935919 RMD160 12c6aae9c02c5895593e4d5bff95a061c71b623c SHA1 9d8c034206f793d6d796b514c9a8242422f0d4f7 SHA256 af5342de8fe9fba5d615caccc9fbcb43cac60b6eb71432f7e112d43850d31c39
 EBUILD nmh-1.3-r3.ebuild 2066 RMD160 c55141e90cd4b4b598c2506f4a1a734dee77fb76 SHA1 b08251acf9da12e112c09eac8218f75395ecbc9e SHA256 f76815fd7f88269227daa4babbb327c614d411f2a34955dd57470a21b3e3ff6e
+EBUILD nmh-1.5.ebuild 1947 RMD160 9857e109db63685383e22dc232d7b638fe88e637 SHA1 da5e837d255534d24d133e64774679eeb4d46873 SHA256 3c44cf56133c22bc33abafe69149469d8aef1b7777712eb098fa1c02e1e11b84
 MISC ChangeLog 1141 RMD160 6efa7d9fc54e0afef37311e188bd8318f1ff8a94 SHA1 159a6ec07e95d9481075345c3abed432b0573211 SHA256 5d1a415490f5dc718cc6904a70032ca25bec9741e69f6e1829dc41bba13ed704
 MISC metadata.xml 507 RMD160 2bd00440cc2917b2cec21e947819371b8b1f266c SHA1 96ace76cb239e27039fb05ebc786605a49c2e50c SHA256 ac107495933bd546fcb565d0e9f832feeb71f0942d2b42f98ae802f0e9542de7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCAAGBQJPU4hBAAoJEHfx8XVYajsfgqsP/1AS1IPzkCexJ3fc0OX7KkZ/
-gmz6xm0oibh7PdmLAasActl15y00Nmx3R1oesHKxE5vLANVomvzUAJy8e9rSrqn3
-jy7K7N4lX6vv9y7nphMFlzarzIvuRU7MNQFmarAB3g2UubGN4x0UtGk3A2q4YM/P
-FOM8Xf/5iatYs5R6eHvnAhlcoLDasu/I5C8y3la8SfpNiQ35681ubEakJqWdjHYO
-j97loEOYLz5MT1zImmPIfmkbG7izqFns8buyI6FXgSeWdkHDTpj0Um0ciWlFLkdO
-mK83TBGlMYQZNkvUTapn06dut+yDMK0cv2xx+xMRk1B/j0BdhGG9eUsFc32RCnq6
-9+nS1eyEty4FwS/uE3YX3okPoeZujyNtKm6Lz0GD5neSzYiCqCP0QhAXoBAGuAeT
-iIBdRFgvymT4YFQdFw1i2jTqw1CAz8J61iJK/r5ldRknItm/4SicmSlzI3cCmbAM
-qrUYJsSS6sYIppWCkX+WQE4Nr0LznWCFKg41lPIU8xqH+/Ck1RtLMUW3rxhNIcQD
-7JYYIkcuToUxuu6p2l4QtVjw7+d8k21B0HMUKuwat4Hpu1R02HfHHK96IJkDU0+u
-liMDPJ3RObPZBlpTpZPEMb1DxPtBUoqVxr2E63KA/p6afBief3B7fxFv+ih38X20
-qydBKx4Zba521WwlAl4S
-=3dly
------END PGP SIGNATURE-----
diff --git a/mail-client/nmh/files/nmh-1.5-inc-login.patch b/mail-client/nmh/files/nmh-1.5-inc-login.patch
new file mode 100644
index 0000000..ab2c407
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.5-inc-login.patch
@@ -0,0 +1,25 @@
+diff -ur nmh-1.5.orig//uip/inc.c nmh-1.5/uip/inc.c
+--- nmh-1.5.orig//uip/inc.c	2012-06-11 13:46:35.086533240 -0700
++++ nmh-1.5/uip/inc.c	2012-06-11 13:47:37.976146809 -0700
+@@ -407,14 +407,19 @@
+      * a POP server?
+      */
+     if (inc_type == INC_POP) {
+-	if (user == NULL)
+-	    user = getusername ();
+ 	if (sasl)
+ 	    pass = getusername ();
+ 	else
+ 	    ruserpass (host, &user, &pass);
+ 
+ 	/*
++	 * Do this _after_ ruserpass, otherwise the login field will be
++	 * unusable.
++	 */
++	if (user == NULL)
++	    user = getusername ();
++
++	/*
+ 	 * initialize POP connection
+ 	 */
+ 	if (pop_init (host, port, user, pass, proxy, snoop, sasl,
diff --git a/mail-client/nmh/files/nmh-1.5-install.patch b/mail-client/nmh/files/nmh-1.5-install.patch
new file mode 100644
index 0000000..b3a6e16
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.5-install.patch
@@ -0,0 +1,11 @@
+diff -ur nmh-1.5.orig//Makefile.in nmh-1.5/Makefile.in
+--- nmh-1.5.orig//Makefile.in	2012-06-11 13:49:24.685491866 -0700
++++ nmh-1.5/Makefile.in	2012-06-11 13:49:37.695412075 -0700
+@@ -41,7 +41,6 @@
+ bin_PROGRAMS = uip/ali$(EXEEXT) uip/anno$(EXEEXT) uip/burst$(EXEEXT) \
+ 	uip/comp$(EXEEXT) uip/dist$(EXEEXT) uip/flist$(EXEEXT) \
+ 	uip/folder$(EXEEXT) uip/forw$(EXEEXT) uip/inc$(EXEEXT) \
+-	uip/install-mh$(EXEEXT) uip/mark$(EXEEXT) uip/mhbuild$(EXEEXT) \
+ 	uip/mhlist$(EXEEXT) uip/mhmail$(EXEEXT) uip/mhn$(EXEEXT) \
+ 	uip/mhparam$(EXEEXT) uip/mhpath$(EXEEXT) uip/mhshow$(EXEEXT) \
+ 	uip/mhstore$(EXEEXT) uip/msgchk$(EXEEXT) uip/msh$(EXEEXT) \
diff --git a/mail-client/nmh/nmh-1.5.ebuild b/mail-client/nmh/nmh-1.5.ebuild
new file mode 100644
index 0000000..de6ee04
--- /dev/null
+++ b/mail-client/nmh/nmh-1.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils base
+
+DESCRIPTION="New MH mail reader"
+HOMEPAGE="http://www.nongnu.org/nmh/"
+SRC_URI="http://savannah.nongnu.org/download/nmh/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="gdbm"
+
+DEPEND="gdbm? ( sys-libs/gdbm )
+	!gdbm? ( sys-libs/db )
+	>=sys-libs/ncurses-5.2
+	net-libs/liblockfile
+	>=app-misc/editor-wrapper-3
+	!!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog DATE MACHINES README )
+
+src_prepare() {
+	# Patches from bug #22173.
+	epatch "${FILESDIR}"/${PN}-1.5-inc-login.patch
+	epatch "${FILESDIR}"/${PN}-1.5-install.patch
+	# bug #57886
+	epatch "${FILESDIR}"/${PN}-1.3-m_getfld.patch
+	# bug #319937
+	epatch "${FILESDIR}"/${PN}-1.3-db5.patch
+}
+
+src_configure() {
+	# Bug 348816 & Bug 341741: The previous ebuild default of
+	# /usr/bin caused unnecessary conflicts with other
+	# packages. However, the default nmh libdir location causes
+	# problems with cross-compiling, so we use, eg., /usr/lib64.
+	# Users may use /usr/lib/nmh in scripts needing these support
+	# programs in normal environments.
+	local myconf="--libdir=${EPREFIX}/usr/$(get_libdir)/nmh"
+
+	# Have gdbm use flag actually control which version of db in use
+	if use gdbm; then
+		myconf="${myconf} --with-ndbmheader=gdbm/ndbm.h --with-ndbm=gdbm_compat"
+	else
+		if has_version ">=sys-libs/db-2"; then
+			myconf="${myconf} --with-ndbmheader=db.h --with-ndbm=db"
+		else
+			myconf="${myconf} --with-ndbmheader=db1/ndbm.h --with-ndbm=db1"
+		fi
+	fi
+
+	# use wrapper scripts to avoid implicit dependencies (Bug #294762)
+	EDITOR=/usr/libexec/editor
+	PAGER=/usr/libexec/pager
+
+	econf \
+		--prefix=${EPREFIX}/usr \
+		--mandir=${EPREFIX}/usr/share/man \
+		--with-editor="${EDITOR}" \
+		--with-pager="${PAGER}" \
+		--enable-nmh-pop \
+		--sysconfdir=${EPREFIX}/etc/nmh \
+		${myconf}
+}