diff --git a/Makefile.am b/Makefile.am
index b5c24a40..1838afe5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+## Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 include $(top_srcdir)/gtest.mk
 
-SUBDIRS=man src
+SUBDIRS=man src contrib
 
 # so we can say 'make test'
 check: test cleanupnote
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
new file mode 100644
index 00000000..63cbb820
--- /dev/null
+++ b/contrib/Makefile.am
@@ -0,0 +1,18 @@
+## Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software Foundation,
+## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+EXTRA_DIST=			\
+	mu-completion.zsh
diff --git a/contrib/mu-completion.zsh b/contrib/mu-completion.zsh
new file mode 100644
index 00000000..632dd851
--- /dev/null
+++ b/contrib/mu-completion.zsh
@@ -0,0 +1,76 @@
+#compdef mu
+#-*-mode:sh-*-
+
+## Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3 of the License, or
+## (at your option) any later version.
+##  
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##  
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software Foundation,
+## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+
+# zsh completion for mu.
+
+_mu_commands() {
+  local -a mu_commands
+  mu_commands=(
+    'index:scan your maildirs and import their metadata in the database'
+    'find:search for messages in the database'
+    'cleanup:remove references to deleted messages from the database'
+    'extract:list message-parts (attachments) and extract them to files'
+    'mkdir:create maildirs'
+    'view:display specific messages'
+  )
+
+  _describe -t command 'command' mu_commands
+}
+
+_mu_view() {
+  _files
+}
+
+_mu_extract() {
+  _files
+}
+
+_mu_find() {
+
+}
+
+_mu_index() {
+
+}
+
+_mu_cleanup() {
+
+}
+
+
+_mu_mkdir() {
+   _arguments -s : \
+    '--mode=[file mode for the new Maildir]:file mode: '
+}
+
+_mu() {
+  if (( CURRENT > 2 )) ; then
+      local cmd=${words[2]}
+      curcontext="${curcontext%:*:*}:mu-$cmd"
+      (( CURRENT-- ))
+      shift words
+      _call_function ret _mu_$cmd
+      return ret
+  else
+      _mu_commands
+  fi
+}
+
+_mu "$@"
+