diff --git a/NEWS b/NEWS
index 86eb79e1..8ef467be 100644
--- a/NEWS
+++ b/NEWS
@@ -4,10 +4,14 @@
    
    - FreeBSD build fix 
    - fix matching for mu cfind to be as expected
+   - fix mu-contacts for broken names/emails
+   - clear the contacts-cache too when doing a --rebuild
    - wildcard searches ('*') for fields (except for path/maildir) 
    - search for attachment file names (with 'a:'/'attach:') -- also works with
      wildcards
    - remove --xquery completely; use --output=xquery instead
+   - fix progress info in 'mu index'
+   - update documentation, add more examples
  
 ** Release 0.9.5 <2011-04-25 Mon>
 
diff --git a/man/mu-cfind.1 b/man/mu-cfind.1
index 9f44b3fb..d7775813 100644
--- a/man/mu-cfind.1
+++ b/man/mu-cfind.1
@@ -1,4 +1,4 @@
-.TH MU CFIND 1 "April 2011" "User Manuals"
+.TH MU CFIND 1 "May 2011" "User Manuals"
 
 .SH NAME 
 
diff --git a/man/mu-easy.1 b/man/mu-easy.1
index cd5ab9a7..b3fafd20 100644
--- a/man/mu-easy.1
+++ b/man/mu-easy.1
@@ -229,7 +229,7 @@ expression, \fBmu cfind\fR lists all of your contacts.
 .fi
 
 will find all contacts with 'julius' in either name or e-mail address. Note
-that \fBmu cfind\fR accepts a regular expression.
+that \fBmu cfind\fR accepts a \fIregular expression\fR.
 
 \fBmu cfind\fR also supports a \fI--format=\fR-parameter, which sets the
 output to some specific format, so the results can be imported into another
diff --git a/man/mu-extract.1 b/man/mu-extract.1
index f767936e..cf788a08 100644
--- a/man/mu-extract.1
+++ b/man/mu-extract.1
@@ -19,9 +19,10 @@ For attachments, the file name used for saving is the name of the attachment
 in the message. If there is no such name, or when saving other MIME-parts, a
 name is derived from the message-id of the message.
 
-If you specify a pattern (a case-insensitive regular expression)as the second
+If you specify a pattern (a case-insensitive regular expression) as the second
 argument, all attachments with filenames matching that pattern will be
-extracted.
+extracted. The regular expressions are Perl-compatible (as per the
+PCRE-library).
 
 Without any options, \fBmu extract\fR simply outputs the list of MIME-parts in
 the message.
diff --git a/man/mu-find.1 b/man/mu-find.1
index a2147a6f..7857c4ef 100644
--- a/man/mu-find.1
+++ b/man/mu-find.1
@@ -73,8 +73,9 @@ mails with a subject containing a word starting with \fBcom\fR, you can use:
 
 and get mails about computers, comments, compilation and so on. Note, when
 running from the command-line it's import to put the query in quotes,
-otherwise the shell would interpret the '*'.
-
+otherwise the shell would interpret the '*'. It is important to remember that
+the '*' invokes the wildcard search only when used as the rightmost character
+of a search term. Furthermore, it is \fBnot\fR a regular expression. 
 
 In older versions of mu, queries were logged in \fI<mu-home>/mu.log\fR;
 however, since version 0.9, mu no longer does this.
diff --git a/www/cheatsheet.org b/www/cheatsheet.org
index ff538227..bdae2d66 100644
--- a/www/cheatsheet.org
+++ b/www/cheatsheet.org
@@ -51,10 +51,34 @@ Here are some tips for using =mu=. If you want to know more, please refer to the
 #+begin_src sh
    $ mu find 'subject:soc*' flag:unread
 #+end_src
+    
+** Find contacts
+   
+   Contacts (names + email addresses) are cached separately, and can be
+   searched with =mu cfind= (after your messages have been indexed):
+
+*** all contacts with 'john' in either name or e-mail address   
+#+begin_src sh
+   $ mu cfind john
+#+end_src
+    
+    =mu cfind= takes a regular expression for matching.
+   
+    You can export the contact information to a number of formats for use in
+    e-mail clients. For examples:
+
+*** export /all/ your contacts to the =mutt= addressbook format
+
+#+begin_src sh
+   $ mu cfind --format=mutt-alias
+#+end_src
+
+    Other formats are: =plain=, =mutt-ab=, =wl= (Wanderlust), =org-contact=,
+    =bbdb= and =csv= (comma-separated values).
+ 
 
 ** Retrieving attachments from messages
    
-
    You can retrieve attachments from messages using =mu extract=, which takes a
    message file as an argument. Without any other arguments, it displays the
    MIME-parts of the message. You can then get specific attachments:
@@ -69,9 +93,12 @@ Here are some tips for using =mu=. If you want to know more, please refer to the
    $ mu extract my-msg-file '.*\.jpg'
 #+end_src
 
-   The second argument is a case-insensitive regular expression, and the command
-   will extract any files matching the pattern -- in the example, all
-   =.jpg=-files.
+   The second argument is a case-insensitive regular expression, and the
+   command will extract any files matching the pattern -- in the example, all
+   =.jpg=-files. 
+
+   Do not confuse the '.*' regular expression in =mu extract= (and =mu cfind=
+   with the '*' wildcard in =mu find=.