diff --git a/srcpkgs/notmuch-deliver b/srcpkgs/notmuch-deliver
deleted file mode 120000
index 67778b7eb37..00000000000
--- a/srcpkgs/notmuch-deliver
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch-python b/srcpkgs/notmuch-python
deleted file mode 120000
index 67778b7eb37..00000000000
--- a/srcpkgs/notmuch-python
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch-python3.4 b/srcpkgs/notmuch-python3.4
deleted file mode 120000
index 67778b7eb37..00000000000
--- a/srcpkgs/notmuch-python3.4
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch-ruby b/srcpkgs/notmuch-ruby
deleted file mode 120000
index 67778b7eb37..00000000000
--- a/srcpkgs/notmuch-ruby
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch-vim b/srcpkgs/notmuch-vim
deleted file mode 120000
index 67778b7eb37..00000000000
--- a/srcpkgs/notmuch-vim
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 451a7b1ae22..023006212fb 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,151 +1,71 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.19
-revision=2
-hostmakedepends="automake libtool pkg-config"
-makedepends="
- xapian-core-devel gmime-devel talloc-devel perl emacs bash-completion
- ruby-devel python-devel python3.4-devel python-Sphinx"
-build_style=gnu-configure
-configure_args="--bashcompletiondir=/usr/share/bash-completion/completions
-  --without-zsh-completion" # zsh completion is part of zsh itself
+version=0.20.2
+revision=1
+hostmakedepends="pkg-config perl python-Sphinx"
+makedepends="xapian-core-devel gmime-devel talloc-devel bash-completion"
 short_desc="The mail indexer"
 maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-3"
 homepage="http://notmuchmail.org"
-distfiles="http://notmuchmail.org/releases/${pkgname}-${version}.tar.gz"
-checksum=396fc6548423785ebbbe9a6cce321d957d3b2e856edb8225bb0988470833eeeb
-nocross=yes
+distfiles="http://notmuchmail.org/releases/notmuch-${version}.tar.gz"
+checksum=f741a26345bff389fd8a4a119c4174c6585730f71844809583a54ef2a865adec
 
-pre_build() {
-	cp -a bindings/python{,3.4}
+subpackages="libnotmuch libnotmuch-devel notmuch-mutt"
+case "$XBPS_TARGET_MACHINE" in
+	i686|x86_64)
+		makedepends+=" emacs"
+		subpackages+=" notmuch-emacs"
+		_args="--emacslispdir=/usr/share/emacs/site-lisp/notmuch
+			--emacsetcdir=/usr/share/emacs/site-lisp/notmuch"
+		;;
+	*) _args="--without-emacs";;
+esac
+
+do_configure() {
+	# fool the endianess test
+	sed -i 's|\(util_byte_order\)=.*|\1=1234|' configure
+	./configure --prefix=/usr \
+		--bashcompletiondir=/usr/share/bash-completion/completions \
+		--zshcompletiondir=/usr/share/zsh/site-functions ${_args}
 }
-
-post_build() {
-	# Build notmuch-mutt
-	make -C contrib/${pkgname}-mutt
-
-	# Build notmuch-deliver
-	cd ${wrksrc}/contrib/${pkgname}-deliver
-	./autogen.sh
-	LDFLAGS="-L$(pwd)/../../lib/" CPPFLAGS="-I$(pwd)/../../lib/" \
-	./configure --prefix=/usr --sysconfdir=/etc --includedir=/usr/include
-	make ${makejobs}
-
-	# Build ruby bindings
-	cd ${wrksrc}/bindings/ruby
-	ruby extconf.rb --vendor
-	make ${makejobs}
-
-	# Build python bindings
-	cd ${wrksrc}/bindings/python
-	python setup.py build
-	cd ${wrksrc}/bindings/python3.4
-	python3.4 setup.py build
+do_build() {
+	make ${makejobs} V=1
+	make -C contrib/notmuch-mutt
 }
-
-post_install() {
-	# Install notmuch-mutt
-	vbin contrib/${pkgname}-mutt/${pkgname}-mutt
-	vman contrib/${pkgname}-mutt/${pkgname}-mutt.1
-
-	# Install notmuch-deliver
-	make -C contrib/${pkgname}-deliver DESTDIR=${DESTDIR} install
-
-	# Install ruby bindings
-	make -C bindings/ruby DESTDIR=${DESTDIR} install
-
-	# Install python bindings
-	cd ${wrksrc}/bindings/python
-	python setup.py install --root=${DESTDIR}
-	cd ${wrksrc}/bindings/python3.4
-	python3.4 setup.py install --root=${DESTDIR}
-
-	# Install vim interface
-	vmkdir usr/share/vim/vimfiles
-	cd ${wrksrc}/contrib/${pkgname}-vim
-	vcopy "plugin syntax" usr/share/vim/vimfiles
+do_install() {
+	make DESTDIR=${DESTDIR} install
 }
 
 libnotmuch_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
-		vmove "usr/lib/*.so.*"
+		vmove usr/lib/*.so.*
 	}
 }
-
 libnotmuch-devel_package() {
 	short_desc+=" - development files"
-	depends="libnotmuch>=${version}_${revision}"
+	depends="libnotmuch-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		vmove usr/lib/*.so
 	}
 }
-
-notmuch-python_package() {
-	noarch=yes
-	short_desc+=" - Python2 bindings"
-	depends="libnotmuch>=${version}_${revision} python"
-	pycompile_module="notmuch"
-	pkg_install() {
-		vmove usr/lib/python2.7
-	}
-}
-
-notmuch-python3.4_package() {
-	noarch=yes
-	short_desc+=" - Python3.4 bindings"
-	depends="libnotmuch>=${version}_${revision} python3.4"
-	pycompile_version="3.4"
-	pycompile_module="notmuch"
-	pkg_install() {
-		vmove usr/lib/python3.4
-	}
-}
-
-notmuch-ruby_package() {
-	short_desc+=" - Ruby bindings"
-	pkg_install() {
-		vmove usr/lib/ruby
-	}
-}
-
-notmuch-deliver_package() {
-	short_desc+=" - Maildir delivery tool"
-	depends="${sourcepkg}>=${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/notmuch-deliver
-		vmove usr/share/doc/notmuch-deliver
-	}
-}
-
 notmuch-emacs_package() {
 	noarch=yes
 	short_desc+=" - Emacs interface"
-	depends="${sourcepkg}>=${version}_${revision} virtual?emacs"
+	depends="${sourcepkg}-${version}_${revision} virtual?emacs"
 	pkg_install() {
 		vmove usr/share/emacs/site-lisp
 	}
 }
-
-notmuch-vim_package() {
-	noarch=yes
-	short_desc+=" - Vim interface"
-	depends="${sourcepkg}>=${version}_${revision} notmuch-ruby vim-huge"
-	pkg_install() {
-		vmove usr/share/vim/vimfiles
-	}
-}
-
 notmuch-mutt_package() {
 	noarch=yes
 	short_desc+=" - Mutt interface"
-	depends="
-	 ${sourcepkg}>=${version}_${revision} perl-Mail-Box perl-MailTools
+	depends="${sourcepkg}-${version}_${revision} perl-Mail-Box perl-MailTools
 	 perl-String-ShellQuote perl-Term-ReadLine-Gnu perl-File-Which"
 	pkg_install() {
-		vmove usr/bin/notmuch-mutt
-		vmove usr/share/man/man1/notmuch-mutt.1
+		vbin contrib/notmuch-mutt/notmuch-mutt
+		vman contrib/notmuch-mutt/notmuch-mutt.1
 	}
 }