diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21e851164..d2cd0d53d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 5.4.0 (2020-07-10)
+
+- Fix generation of signed metadata
+- Add attribute mappings used by SwedenConnect (DIGG, INERA and PKIX specifications)
+- Update SWAMID entity category
+- Document the `additional_cert_files` configuration option
+
+
 ## 5.3.0 (2020-06-25)
 
 - Fix check for nameid_format set to the string "None" in the configuration
diff --git a/VERSION b/VERSION
index 03f488b07..8a30e8f94 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.3.0
+5.4.0