diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7e9032288..b29a4f3fa 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.0.0
+current_version = 6.1.0
 commit = True
 tag = True
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbfd0a0ec..d22f425d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 6.1.0 (2020-02-28)
+
+- Set the SameSite cookie attribute to "None"
+- Add compatibility support for the SameSite attribute for incompatible
+  browsers
+- Set the Secure attribute of the cookie, always
+- Set minimum pysaml2 version to make sure we get a version patched for
+  CVE-2020-5390
+- Fix typos and improve documetation
+- Set the session-id when state is created
+- Use LinkedIn API v2
+
+
 ## 6.0.0 (2019-12-17)
 
 - properly support mutliple values when converting internal attributes to OIDC
diff --git a/setup.py b/setup.py
index c91da28fa..0f9fb46eb 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name='SATOSA',
-    version='6.0.0',
+    version='6.1.0',
     description='Protocol proxy (SAML/OIDC).',
     author='DIRG',
     author_email='satosa-dev@lists.sunet.se',