diff --git a/CHANGELOG.md b/CHANGELOG.md
index acadce1..cc4560c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,10 @@
 
 Template:
 
-## New Features
-
 ## Breaking Changes
 
+## New Features
+
 ## User Facing Backwards Compatible Changes
 
 ## Fixes
@@ -16,6 +16,27 @@ Template:
 
 # Upcoming Release
 
+# v0.4.0
+
+## Breaking Changes
+
+- Rename ldap module to lldap as well as option name `shb.ldap` to `shb.lldap`.
+
+## New Features
+
+- Jellyfin service now waits for Jellyfin server to be fully available before starting.
+- Add debug option for Jellyfin.
+- Allow to choose port for Jellyfin.
+- Make Jellyfin setup including initial admin user declarative.
+
+## Fixes
+
+- Fix Jellyfin redirect URI scheme after update.
+
+## Other Changes
+
+- Add documentation for LLDAP and Authelia block and link to it from other docs.
+
 # v0.3.1
 
 ## Breaking Changes
diff --git a/VERSION b/VERSION
index a2268e2..60a2d3e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.1
\ No newline at end of file
+0.4.0
\ No newline at end of file