diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index f5df83133ff..1406ba4086f 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,17 +1,18 @@
 # Template file for 'nmh'
 pkgname=nmh
 version=1.6
-revision=15
+revision=16
 build_style=gnu-configure
 configure_args="--sysconfdir=/etc/nmh --libdir=/usr/libexec/nmh --with-cyrus-sasl --with-tls"
 makedepends="ncurses-devel db-devel libsasl-devel libressl-devel"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD"
 homepage="http://www.nongnu.org/nmh/"
 distfiles="http://download.savannah.gnu.org/releases/$pkgname/$pkgname-1.6.tar.gz"
 checksum=29338ae2bc8722fe8a5904b7b601a63943b72b07b6fcda53f3a354edb6a64bc3
+conflicts="pick>=0"
 
 pre_build() {
 	make CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" LDFLAGS="$BUILD_LDFLAGS" sbr/ctype-checked.h