diff --git a/ChangeLog.md b/ChangeLog.md
index 4dc679c..15466e4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,17 @@
+# Release 0.4
+
+* Bugfixes:
+  * Using many workspaces and many windows might resulted at some point into short loops of b3 switching between the windows by its own. This is finally solved.
+  * Toggling a window to fullscreen is fully supported. It will stay in fullscreen even when switching between workspaces.
+
+Features:
+* Setting key bindings is now possible in a configuration file. Re-compilationis not needed any more. For the availabe commands see the [Compatibility List](https://github.com/ritschmaster/b3/blob/master/CompatibilityList.md)
+* A CLI interface like in i3 (e.g. `b3.exe -d` to enable logging on debug level).
+
+Known bugs:
+* Windows in fullscreen might not be repainted when switching onto their workspace. This results into just a big white window. Switching onto the workspace again redraws the window correctly.
+* Re-drawing of moved windows does not always work correctly. This is most likely due some lacking hacks when using the WIN32 API.
+
 # Release 0.3
 
 Bugfixes:
diff --git a/Makefile.am b/Makefile.am
index c41ccaa..ab94b2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,5 +40,5 @@ release-zip:
 	zip @PACKAGE_NAME@-@PACKAGE_VERSION@.zip README.md
 	zip @PACKAGE_NAME@-@PACKAGE_VERSION@.zip ChangeLog.md
 	zip @PACKAGE_NAME@-@PACKAGE_VERSION@.zip CompatibilityList.md
-	zip @PACKAGE_NAME@-@PACKAGE_VERSION@.zip src/b3.exe
+	zip @PACKAGE_NAME@-@PACKAGE_VERSION@.zip -j src/b3.exe