diff --git a/etc/defaults.virtual b/etc/defaults.virtual
index 09f9fb16e52..1c6cdc0ce8c 100644
--- a/etc/defaults.virtual
+++ b/etc/defaults.virtual
@@ -20,6 +20,7 @@
 # NOTE: Create your own etc/virtual file to override these defaults.
 
 awk gawk
+emacs emacs
 java-environment openjdk
 java-runtime openjdk-jre
 libudev eudev-libudev
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 93147ad20f8..74320e9f173 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,6 +1,6 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.21
+version=0.22
 revision=1
 hostmakedepends="pkg-config perl python-Sphinx"
 makedepends="xapian-core-devel gmime-devel talloc-devel bash-completion"
@@ -9,7 +9,7 @@ maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-3"
 homepage="http://notmuchmail.org"
 distfiles="http://http.debian.net/debian/pool/main/n/notmuch/notmuch_${version}.orig.tar.gz"
-checksum=d06f8ffed168c7d53ffc449dd611038b5fa90f7ee22d58f3bec3b379571e25b3
+checksum=d64118ef926ba06fba814a89a75d20b0c8c8ec07dd65e41bb9f1e9db0dcfb99a
 
 nocross="http://build.voidlinux.eu/builders/armv7l-musl_builder/builds/6341/steps/shell_3/logs/stdio"