diff --git a/NEWS b/NEWS
index d1825a3a..3e5716a7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 * NEWS (user visible changes)
 
+** Release 0.9.5 <2011-04-25 Mon>
+
+   - bug fix for infinite loop in Maildir detection
+   - minor fixes in tests, small optimizations
+
 ** Release 0.9.4 <2011-04-12 Tue>
 
    - add the 'cfind' command, to search/export contact information
diff --git a/TODO b/TODO
index 982d68ba..57709ca9 100644
--- a/TODO
+++ b/TODO
@@ -12,6 +12,11 @@
    - [ ] better 'usage' info
 
 
+* Releases already done
+
+** release 0.9.5 [100%]
+   
+
 ** release 0.9.4 [100%] 
 
    - [X] add 'mu cfind' to find contacts
@@ -20,8 +25,6 @@
    - [X] internal updates
 
 
-* Releases already done
-
 ** release 0.9.3 [100%]
 
    - [X] minor bug fixes since 0.9.2 
diff --git a/configure.ac b/configure.ac
index 29dedc15..2e9aff04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 ## along with this program; if not, write to the Free Software Foundation,
 ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
 
-AC_INIT([mu],[0.9.4],[http://code.google.com/p/mu0/issues/list])
+AC_INIT([mu],[0.9.5],[http://code.google.com/p/mu0/issues/list])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/mu.cc])
 AM_INIT_AUTOMAKE([dist-bzip2])
diff --git a/www/index.org b/www/index.org
index 0dcee191..9f88aba7 100644
--- a/www/index.org
+++ b/www/index.org
@@ -4,7 +4,7 @@
 
 * Welcome to mu!
 
-  Given the /enormous/ amounts of e-mail many people gather, and the importance
+  Given the /enormous/ amounts of e-mail many people gather and the importance
   of e-mail message in our work-flows, it's essential to quickly deal with all
   that mail - in particular, to instantly find that one important e-mail you
   need right now.
@@ -19,6 +19,9 @@
   
 ** News
    
+   - 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
      contacts (name + e-mail); add =flag:unread= which is a synonym for
      =flag:new OR NOT flag:seen=. Updates to the documentation and some internal
@@ -38,7 +41,7 @@
    - fast indexing for Maildir, Maildir+ and Maildir-on-VFAT
    - search for messages based on the sender, receiver, message subject, size,
      priority, words in the message body, attachments, date range, flags
-     (signed, encrypted, new, replied, ...), message-id, maildir
+     (signed, encrypted, new, replied, unread, ...), message-id, maildir
    - known to work on Linux (Ubuntu/Fedora/Debian/GenToo), FreeBSD, MacOS,
      Solaris, ...
    - fully documented (man pages)