diff --git a/i3bar/CHANGELOG b/i3bar/CHANGELOG
index 0106447e..b8030e43 100644
--- a/i3bar/CHANGELOG
+++ b/i3bar/CHANGELOG
@@ -1,8 +1,13 @@
+v0.6
+=====
+- Add manpage
+- Implement hide-on-modifier
+- Custom colors can be set from the commandline
+- Use double-buffering
 - Bugfix: Correctly render long text
 - Bugfix: Don't segfault on SIGCHILD
-- Implement hide-on-modifier
-- Use double-buffering
-
+- Bugfix: Double-fork() to avoid zombies
+- Some minor bugfixes
 
 v0.5
 =====
diff --git a/i3bar/doc/i3bar.man b/i3bar/doc/i3bar.man
index c41371b8..9ee7f7ce 100644
--- a/i3bar/doc/i3bar.man
+++ b/i3bar/doc/i3bar.man
@@ -1,7 +1,7 @@
 i3bar(1)
 ========
 Axel Wagner <mail+i3bar@merovius.de>
-v0.5, September 2010
+v0.6, September 2010
 
 == NAME