diff --git a/Makefile b/Makefile
index 021fdb82..64b9d4aa 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ EMACS ?= emacs
 gzip = gzip
 
 bash_completion_dir = /etc/bash_completion.d
+zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix
 
 all_deps = Makefile Makefile.local Makefile.config \
 		   lib/Makefile lib/Makefile.local
diff --git a/Makefile.local b/Makefile.local
index 933ff4c7..d579242c 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -48,5 +48,10 @@ install-bash:
 	install -m0644 contrib/notmuch-completion.bash \
 		$(DESTDIR)$(bash_completion_dir)/notmuch
 
+install-zsh:
+	install -d $(DESTDIR)$(zsh_completion_dir)
+	install -m0644 contrib/notmuch-completion.zsh \
+		$(DESTDIR)$(zsh_completion_dir)/notmuch
+
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch $(notmuch_client_modules) notmuch.elc notmuch.1.gz