diff --git a/contrib/notmuch-completion.tcsh b/contrib/notmuch-completion.tcsh
new file mode 100644
index 00000000..c0d3a446
--- /dev/null
+++ b/contrib/notmuch-completion.tcsh
@@ -0,0 +1,2 @@
+set NOTMUCH_CMD=`notmuch help | awk '/\t/' | cut -f2 |grep -v '^$'`
+complete notmuch 'p/1/$NOTMUCH_CMD/'