diff --git a/CHANGES.md b/CHANGES.md
index 501d5b27..d9613cee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+# 2.1.0 (2024-07-25)
+* Discovery:
+  - Fetch on startup in the background with a function "DiscoveryStartup"
+  - Remove organization 4 hour expiry, fetch organization list when the client needs to authorize again
+  - Fix missing JSON fields not having empty values but having values for previous entries due to a memory re-use bug (#55). This can be noticed in e.g. the keyword list
+  - Implement conditional requests using `If-Modified-Since` request header and `Last-Modified` response header and checking on HTTP 304
+* FSM:
+  - Allow AskProfile selection after authorizing
+  - Go to previous state on renew error
+* Proxyguard integration:
+  - Fix race condition warning
+* User agent:
+  - Override ProxyGuard user agent
+  - Override eduoauth-go user agent
+* Deps:
+  - Update to latest versions
+
 # 2.0.2 (2024-06-25)
 * Client: More frequent state file saving which helps forceful closes of a client
 * Config: Implement atomic file writes
diff --git a/go.mod b/go.mod
index 3748cb06..449ee4d8 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/eduvpn/eduvpn-common
 go 1.18
 
 require (
-	codeberg.org/eduVPN/proxyguard v0.0.0-20240717121319-c80d3bd681d6
+	codeberg.org/eduVPN/proxyguard v0.0.0-20240723101427-d0b2383c372c
 	github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267
 	github.com/jwijenbergh/eduoauth-go v1.1.0
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
diff --git a/go.sum b/go.sum
index 18bcfcec..7703a6bc 100644
--- a/go.sum
+++ b/go.sum
@@ -8,6 +8,8 @@ codeberg.org/eduVPN/proxyguard v0.0.0-20240702093453-d36a0e1819c1 h1:ma/pIMy0ZfP
 codeberg.org/eduVPN/proxyguard v0.0.0-20240702093453-d36a0e1819c1/go.mod h1:fc7DsdgdLmrO7DN45HNp+ekVewlRcikSOkAvUeGUvWk=
 codeberg.org/eduVPN/proxyguard v0.0.0-20240717121319-c80d3bd681d6 h1:SraE4iJ5ctet/cytU1ApMFaSBW/DeyTTo0eLnDDc5Lg=
 codeberg.org/eduVPN/proxyguard v0.0.0-20240717121319-c80d3bd681d6/go.mod h1:fc7DsdgdLmrO7DN45HNp+ekVewlRcikSOkAvUeGUvWk=
+codeberg.org/eduVPN/proxyguard v0.0.0-20240723101427-d0b2383c372c h1:C+CRKtZb8pEdNsaZuvheoTInlEUFqtOpF0lUvreD79Q=
+codeberg.org/eduVPN/proxyguard v0.0.0-20240723101427-d0b2383c372c/go.mod h1:fc7DsdgdLmrO7DN45HNp+ekVewlRcikSOkAvUeGUvWk=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY=
 github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267/go.mod h1:h1nSAbGFqGVzn6Jyl1R/iCcBUHN4g+gW1u9CoBTrb9E=
diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go
index fedddca6..dc4c51ed 100644
--- a/internal/discovery/discovery.go
+++ b/internal/discovery/discovery.go
@@ -5,8 +5,8 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"net/http"
 	"fmt"
+	"net/http"
 	"time"
 
 	httpw "github.com/eduvpn/eduvpn-common/internal/http"
diff --git a/internal/version/version.go b/internal/version/version.go
index 98e07c2c..f1e19863 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -6,4 +6,4 @@ package version
 
 // Version is the latest version
 // Update this when releasing
-const Version = "2.0.2"
+const Version = "2.1.0"
diff --git a/wrappers/python/eduvpn_common/__init__.py b/wrappers/python/eduvpn_common/__init__.py
index 0309ae29..9aa3f903 100644
--- a/wrappers/python/eduvpn_common/__init__.py
+++ b/wrappers/python/eduvpn_common/__init__.py
@@ -1 +1 @@
-__version__ = "2.0.2"
+__version__ = "2.1.0"
diff --git a/wrappers/python/setup.cfg b/wrappers/python/setup.cfg
index b4c637bc..f16f6c03 100644
--- a/wrappers/python/setup.cfg
+++ b/wrappers/python/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = eduvpn_common
-version = 2.0.2
+version = 2.1.0
 author = Jeroen Wijenbergh
 author_email = jeroen.wijenbergh@geant.org
 description = Python wrapper for eduvpn-common, a codebase to build eduVPN clients with