diff --git a/NEWS b/NEWS
index 4ad1f8c6..d1d4bfa6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 * NEWS (user visible changes)
  
-** Release 0.9.6 < not yet >
+** Release 0.9.6 <2011-05-28 Sat>
    
    - FreeBSD build fix 
    - fix matching for mu cfind to be as expected
@@ -16,7 +16,7 @@
    - support colorized output for some sub-commands (view, cfind and
      extract). Disabled by default, use --color to enable, or set env
      MU_COLORS to non-empty
-   - update documentation, add more examples
+   - update documentation, added more examples
      
 ** Release 0.9.5 <2011-04-25 Mon>
 
diff --git a/TODO b/TODO
index 500cfab3..0cb61cf0 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,8 @@
      
 * Releases already done
 
+** release 0.9.6 [100%]
+  
 ** release 0.9.5 [100%]
    
    
diff --git a/configure.ac b/configure.ac
index d0efac58..24dd5ac7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,7 @@ AC_SUBST(XAPIAN_LIBS)
 # note that MU_XAPIAN_DB_VERSION does not necessarily follow MU
 # versioning, as we hopefully don't have updates for each version;
 # also, this has nothing to do with Xapian's software version
-AC_DEFINE(MU_XAPIAN_DB_VERSION,["9.5"], ['Schema' version of the database])
+AC_DEFINE(MU_XAPIAN_DB_VERSION,["9.6"], ['Schema' version of the database])
 
 AC_ARG_WITH([gui],
    [AS_HELP_STRING([--with-gui=gtk2|gtk3|none])],
diff --git a/src/mu-str.c b/src/mu-str.c
index b8e8703e..555ef56b 100644
--- a/src/mu-str.c
+++ b/src/mu-str.c
@@ -343,7 +343,7 @@ mu_str_size_parse_kmg (const char* str)
 	case 'b': return num;                      /* bytes */	
 	case 'k': return num * 1000;               /* kilobyte */
 	case 'm': return num * 1000 * 1000;        /* megabyte */
-		/* case 'g': return num * 1000 * 1000 * 1000; /\* gigabyte *\/ */
+	/* case 'g': return num * 1000 * 1000 * 1000; /\* gigabyte *\/ */
 	default:
 		return G_MAXUINT64;
 	}
diff --git a/www/index.org b/www/index.org
index 9f88aba7..fbbf6da5 100644
--- a/www/index.org
+++ b/www/index.org
@@ -19,7 +19,16 @@
   
 ** News
    
-   - 2011-04-25 *mu-0.9.5* a small, but important, bugfix in maildir-detection,
+   - 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
+     cheatsheet]].
+
+   - 2011-04-25: *mu-0.9.5* a small, but important, bugfix in maildir-detection,
      some small optimizations.
 
    - 2011-04-12: *mu 0.9.4* released - adds the =cfind= command, to find