diff --git a/www/cheatsheet.org b/www/cheatsheet.org
index 909a8b92..b3b1841e 100644
--- a/www/cheatsheet.org
+++ b/www/cheatsheet.org
@@ -10,14 +10,10 @@
 ** Indexing your mail
 
   You can index your mail with:
-#+begin_src sh
-   $ mu index
-#+end_src
+#+html:<code> $ mu index</code>
 
   If =mu= did not guess the right Maildir, you can set it explicitly:
-#+begin_src sh
-   $ mu index --maildir=~/MyMaildir
-#+end_src
+#+html:<code> $ mu index --maildir=~/MyMaildir</code>
 
 *** Excluding directories from indexing  
   If you want to exclude certain directories from being indexed (for example,
@@ -31,29 +27,16 @@
    examples.
 
 *** messages about Helsinki (in message body, subject, sender, ...)
-
-#+begin_src sh
-   $ mu find Helsinki
-#+end_src
+#+html:<code> $ mu find Helsinki</code>
 
 *** messages to Jack with subject jellyfish containing the word tumbleweed
-
-#+begin_src sh
-   $ mu find to:Jack subject:jellyfish tumbleweed
-#+end_src
+#+html:<code> $ mu find to:Jack subject:jellyfish tumbleweed</code>
 
 *** messages between 2 kilobytes and a 2Mb, written in December 2009 with an attachment from Bill
-
-#+begin_src sh
-   $ mu find size:2k..2m date:20091201..20093112 flag:attach from:bill
-#+end_src
+#+example $ mu find size:2k..2m date:20091201..20093112 flag:attach from:bill
  
 *** unread messages about soccer or socrates or ...
-
-#+begin_src sh
-   $ mu find 'subject:soc*' flag:unread
-#+end_src
-    
+#+html:<code>  $ mu find 'subject:soc*' flag:unread</code>
 
 ** Finding contacts
    
@@ -61,20 +44,15 @@
    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
-    
+#+html:<code> $ mu cfind john</code>
+
     =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
+#+html:<code> $ mu cfind --format=mutt-alias</code>
 
     Other formats are: =plain=, =mutt-ab=, =wl= (Wanderlust), =org-contact=,
     =bbdb= and =csv= (comma-separated values).
@@ -85,16 +63,11 @@
    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:
-
-#+begin_src sh
-   $ mu extract --parts=3,4 my-msg-file
-#+end_src
+#+html:<code> $ mu extract --parts=3,4 my-msg-file</code>
 
    will get you parts 3 and 4. You can also extract files based on their name:
 
-#+begin_src sh
-   $ mu extract my-msg-file '.*\.jpg'
-#+end_src
+#+html:<code> $ mu extract my-msg-file '.*\.jpg'</code>
 
    The second argument is a case-insensitive regular expression, and the
    command will extract any files matching the pattern -- in the example, all
@@ -110,9 +83,7 @@
    it with =--color=, or setting the =MU_COLORS= environment variable to
    non-empty.
 
-#+begin_src sh
-   $ mu find --color capibara
-#+end_src
+#+html:<code> $ mu find --color capibara</code>
    
    (since =mu= version 0.9.6)
    
@@ -124,9 +95,7 @@
   For example, to get the number of lines in all your messages mentioning
   /banana/, you could use something like:
 
-#+begin_src sh
-   $ mu find --fields="'l'" banana | xargs wc -l
-#+end_src
+#+html:<code> $ mu find --fields="'l'" banana | xargs wc -l</code>
 
   Note that we use ='l'=, so the returned message paths will be quoted. This is
   useful if you have maildirs with spaces in their names.
@@ -134,9 +103,7 @@
   For further processing, also the ~--format=(xml|json|sexp)~ can be useful. For
   example,
 
-#+begin_src sh
-   $ mu find --format=xml pancake
-#+end_src
+#+html:<code> $ mu find --format=xml pancake</code>
 
   will give you a list of pancake-related messages in XML-format.
    
diff --git a/www/index.org b/www/index.org
index 2ecf92d2..8bfe55fb 100644
--- a/www/index.org
+++ b/www/index.org
@@ -18,14 +18,18 @@
   can then be queried using a custom query language.
   
 ** News
-   
+
+   - 2011-06-02: after quite a bit of testing, *0.9.6* has been promoted to be
+     the next release -- forget about the 'bèta'. Development continues for
+     the next release.
+
    - 2011-05-28: *mu-0.9.6* (bèta). A lot of internal changes, but also quite
      some new features, for example:
      - wild-card searching for most fields: mu find 'car*'
      - search for message with certain attachments with 'attach:/a:': mu find
        'attach:resume*'
      - color for =mu find=, =mu cfind=, =mu extract= and =mu view= 
-     Everything is documented in the man-pages, and there are examples in the [[file:mu-cheatsheet.org][mu
+     Everything is documented in the man-pages, and there are examples in the [[file:cheatsheet.org][mu
      cheatsheet]].
 
    - 2011-04-25: *mu-0.9.5* a small, but important, bugfix in maildir-detection,