diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 35f7a82c..1a8457bb 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 8.4.0
+current_version = 8.5.0
 commit = True
 tag = True
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee782f08..380f8bda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 8.5.0 (2025-01-08)
+
+- openid connect backend: Add OAuth2/OIDC backend based on idpy-oidc (new extra requirement `idpy_oidc_backend` to pull the library dependecy)
+- apple backend: Rework the Apple backend to be based on the generic OpenIDConnectBackend and fix the userinfo loading
+- Restructure fatal error messages to redirect to generic error page when an errors occur
+- Allow multiple values for the "resource" query param
+- Fix checks for missing state from cookie and missing relay state
+- Allow loading of tuples from YAML configs
+- docs: minor fixes
+
+
 ## 8.4.0 (2023-06-11)
 
 - Make cookie parameters configurable
diff --git a/setup.py b/setup.py
index 51bb389e..5e802545 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name='SATOSA',
-    version='8.4.0',
+    version='8.5.0',
     description='Protocol proxy (SAML/OIDC).',
     author='DIRG',
     author_email='satosa-dev@lists.sunet.se',