diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 0a4e9132d100..f24606e89b59 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	notmuch
-PORTVERSION=	0.17
+PORTVERSION=	0.18.1
 CATEGORIES=	mail
 MASTER_SITES=	http://notmuchmail.org/releases/
 
@@ -11,6 +11,7 @@ COMMENT=	Thread-based email index, search, and tagging application
 
 LICENSE=	GPLv3
 
+BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
 LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
 		libxapian.so:${PORTSDIR}/databases/xapian-core \
 		libtalloc.so:${PORTSDIR}/devel/talloc
@@ -20,4 +21,7 @@ USES=		pkgconfig gmake
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 USE_LDCONFIG=	yes
 
+USE_PYTHON_BUILD=	yes
+MAKE_ENV+=		PYTHONCMD=${PYTHON_CMD}
+
 .include <bsd.port.mk>
diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo
index c81ccf9911d4..1a8a8683e7ea 100644
--- a/mail/notmuch/distinfo
+++ b/mail/notmuch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notmuch-0.17.tar.gz) = d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc637c4dcebdb57d5c4bcbe95
-SIZE (notmuch-0.17.tar.gz) = 606710
+SHA256 (notmuch-0.18.1.tar.gz) = f2d53dc1916283123d008a6084de860340a436631e83b1a41b2d9ced0f4db7dd
+SIZE (notmuch-0.18.1.tar.gz) = 634691
diff --git a/mail/notmuch/files/patch-Makefile.local b/mail/notmuch/files/patch-Makefile.local
new file mode 100644
index 000000000000..f0b2bf84635e
--- /dev/null
+++ b/mail/notmuch/files/patch-Makefile.local
@@ -0,0 +1,11 @@
+--- Makefile.local.orig	2014-06-25 10:30:10.000000000 +0000
++++ Makefile.local
+@@ -302,7 +302,7 @@ notmuch-shared: $(notmuch_client_modules
+ .PHONY: install
+ install: all install-man
+ 	mkdir -p "$(DESTDIR)$(prefix)/bin/"
+-	install notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch"
++	${BSD_INSTALL_PROGRAM} notmuch-shared "$(DESTDIR)$(prefix)/bin/notmuch"
+ ifeq ($(MAKECMDGOALS), install)
+ 	@echo ""
+ 	@echo "Notmuch is now installed to $(DESTDIR)$(prefix)"
diff --git a/mail/notmuch/files/patch-doc_Makefile.local b/mail/notmuch/files/patch-doc_Makefile.local
new file mode 100644
index 000000000000..2a89db236667
--- /dev/null
+++ b/mail/notmuch/files/patch-doc_Makefile.local
@@ -0,0 +1,13 @@
+--- doc/Makefile.local.orig	2014-06-25 10:30:10.000000000 +0000
++++ doc/Makefile.local
+@@ -7,8 +7,8 @@ SPHINXOPTS    := -q
+ SPHINXBUILD   = sphinx-build
+ DOCBUILDDIR      := $(dir)/_build
+ 
+-prerst2man := python $(srcdir)/$(dir)/prerst2man.py
+-mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
++prerst2man := ${PYTHONCMD} $(srcdir)/$(dir)/prerst2man.py
++mkdocdeps := ${PYTHONCMD} $(srcdir)/$(dir)/mkdocdeps.py
+ 
+ # Internal variables.
+ ALLSPHINXOPTS   := -d $(DOCBUILDDIR)/doctrees $(SPHINXOPTS) $(srcdir)/$(dir)
diff --git a/mail/notmuch/files/patch-lib_Makefile.local b/mail/notmuch/files/patch-lib_Makefile.local
new file mode 100644
index 000000000000..4f450748b9f2
--- /dev/null
+++ b/mail/notmuch/files/patch-lib_Makefile.local
@@ -0,0 +1,16 @@
+--- lib/Makefile.local.orig	2014-06-25 10:30:10.000000000 +0000
++++ lib/Makefile.local
+@@ -92,11 +92,11 @@ install: install-$(dir)
+ 
+ install-$(dir): $(dir)/$(LIBNAME)
+ 	mkdir -p "$(DESTDIR)$(libdir)/"
+-	install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
++	${BSD_INSTALL_LIB} "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
+ 	ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(SONAME)"
+ 	ln -sf $(LIBNAME) "$(DESTDIR)$(libdir)/$(LINKER_NAME)"
+ 	mkdir -p "$(DESTDIR)$(includedir)"
+-	install -m0644 "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/"
++	${BSD_INSTALL_DATA} "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/"
+ 	$(LIBRARY_INSTALL_POST_COMMAND)
+ 
+ SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
index 9be6e3b16ca6..7895869170bd 100644
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@@ -1,5 +1,4 @@
 bin/notmuch
-etc/bash_completion.d/notmuch
 include/notmuch.h
 lib/libnotmuch.so.3.1.0
 lib/libnotmuch.so
@@ -20,11 +19,11 @@ man/man1/notmuch.1.gz
 man/man5/notmuch-hooks.5.gz
 man/man7/notmuch-search-terms.7.gz
 share/emacs/site-lisp/coolj.el
-share/emacs/site-lisp/notmuch-logo.png
 share/emacs/site-lisp/notmuch-address.el
 share/emacs/site-lisp/notmuch-crypto.el
 share/emacs/site-lisp/notmuch-hello.el
 share/emacs/site-lisp/notmuch-lib.el
+share/emacs/site-lisp/notmuch-logo.png
 share/emacs/site-lisp/notmuch-maildir-fcc.el
 share/emacs/site-lisp/notmuch-message.el
 share/emacs/site-lisp/notmuch-mua.el
@@ -34,10 +33,10 @@ share/emacs/site-lisp/notmuch-query.el
 share/emacs/site-lisp/notmuch-show.el
 share/emacs/site-lisp/notmuch-tag.el
 share/emacs/site-lisp/notmuch-tree.el
+share/emacs/site-lisp/notmuch-version.el
 share/emacs/site-lisp/notmuch-wash.el
 share/emacs/site-lisp/notmuch.el
 share/zsh/functions/Completion/Unix/_notmuch
-@dirrmtry etc/bash_completion.d
 @dirrmtry share/zsh/functions/Completion/Unix
 @dirrmtry share/zsh/functions/Completion
 @dirrmtry share/zsh/functions