diff --git a/completion/README b/completion/README
new file mode 100644
index 00000000..40a30e5f
--- /dev/null
+++ b/completion/README
@@ -0,0 +1,10 @@
+notmuch completion
+
+This directory contains support for various shells to automatically
+complete partially entered notmuch command lines.
+
+notmuch-completion.bash	Command-line completion for the bash shell
+
+notmuch-completion.tcsh	Command-line completion for the tcsh shell
+
+notmuch-completion.zsh	Command-line completion for the zsh shell
diff --git a/contrib/notmuch-completion.bash b/completion/notmuch-completion.bash
similarity index 100%
rename from contrib/notmuch-completion.bash
rename to completion/notmuch-completion.bash
diff --git a/contrib/notmuch-completion.tcsh b/completion/notmuch-completion.tcsh
similarity index 100%
rename from contrib/notmuch-completion.tcsh
rename to completion/notmuch-completion.tcsh
diff --git a/contrib/notmuch-completion.zsh b/completion/notmuch-completion.zsh
similarity index 100%
rename from contrib/notmuch-completion.zsh
rename to completion/notmuch-completion.zsh