diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2cd0d53d..cadc2b651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 6.0.0 (2020-07-10)
+
+- Differentiate between metadata NameIDFormat and AuthnRequest NameIDPolicy Format
+  - Users using `name_id_format` to set the `<NameIDPolicy Format="...">` attribute now
+    need to use the new configuration option `name_id_policy_format`.
+- Fix documentation formatting
+
 ## 5.4.0 (2020-07-10)
 
 - Fix generation of signed metadata
diff --git a/VERSION b/VERSION
index 8a30e8f94..09b254e90 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.4.0
+6.0.0