diff --git a/CHANGELOG.md b/CHANGELOG.md
index da8d9a0..6fdf45a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,39 @@
 # Changelog
 
+## v0.4.0
+
+## Enhancements
+
+* Allow to parse/create EPUBs in memory
+* README: Update sample for the EPUB Parser
+* Split parsing of metadata and manifest sections
+* Improve EPUB parsing
+* Apply `mix format` to parser
+* Better support for UTF-8
+* Improve mimetype and zip creation
+* Remove some options from the default config
+* Add more tests for the Builder
+* Allow to opt-out of the default cover page
+
+## Bug fixes
+
+* Fix example in `BUPE.Builder` docs
+
 ## 0.3.0
 
- * Enhancements
-   * Allow BUPE as dependency in escripts projects
- * Fixes
-   * Include reference to images in the OPF manifest
+### Enhancements
+
+  * Allow BUPE as dependency in escripts projects
+
+### Bug fixes
+
+  * Include reference to images in the OPF manifest
 
 ## v0.2.0
 
-  * Enhancements
-    * Allow to include images, JS and CSS custom files.
+### Enhancements
+
+  * Allow to include images, JS and CSS custom files.
 
 ## v0.1.0
 
diff --git a/mix.exs b/mix.exs
index 661378b..3d373f2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule BUPE.Mixfile do
   use Mix.Project
 
-  @version "0.3.1-dev"
+  @version "0.4.0"
 
   def project do
     [