diff --git a/contrib/gmime-test.c b/contrib/gmime-test.c
index 60797ea3..5a5ffa8f 100644
--- a/contrib/gmime-test.c
+++ b/contrib/gmime-test.c
@@ -1,5 +1,7 @@
+/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/
+
 /*
-** Copyright (C) 2011 djcb <djcb@cthulhu>
+** Copyright (C) 2011 Dirk-Jan C. Binnema <djcb@cthulhu>
 **
 ** 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
@@ -17,8 +19,6 @@
 **
 */
 
-
-
 /* gmime-test; compile with:
        gcc -o gmime-test gmime-test.c -Wall -O0 -ggdb3 \
            `pkg-config --cflags --libs gmime-2.4`
diff --git a/contrib/mu-completion.zsh b/contrib/mu-completion.zsh
index 84ebd7c1..17b54624 100644
--- a/contrib/mu-completion.zsh
+++ b/contrib/mu-completion.zsh
@@ -1,6 +1,6 @@
 #compdef mu
 
-## Copyright (C) 2008-2010 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+## Copyright (C) 2008-2011 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
@@ -23,6 +23,7 @@ _mu_commands() {
   mu_commands=(
     'index:scan your maildirs and import their metadata in the database'
     'find:search for messages in the database'
+    'cfind:search for contacts (name + email) 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'
@@ -39,9 +40,19 @@ _mu_common_options=(
 )
 
 _mu_db_options=(
-    '--muhome[use some non-default location for the mu database]:directory:_files'    
+    '--muhome[use some non-default location for the mu database]:directory:_files'
 )
 
+_mu_find_options=(
+    '--fields[fields to display in the output]'
+    '--sortfield[field to sort the output by]'
+    '--descending[sort in descending order]'
+    '--summary-len[length of the summary for a message]'
+    '--bookmark[use a named bookmark]'
+    '--output[set the kind of output for the query]'
+)
+
+
 
 _mu_view() {
   _files  
@@ -53,7 +64,9 @@ _mu_extract() {
 
 _mu_find() {
     _arguments -s : \
-        $_mu_common_options
+        $_mu_common_options \
+	$_mu_db_options \
+	$_mu_find_options
 }
 
 _mu_index() {