diff --git a/ChangeLog b/ChangeLog
index b39dec7a..30d75db6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+ver 2.21:
+	Fix issue with pending scan requests after regdom update.
+	Fix issue with handling the rearming of the roaming timeout.
+	Fix issue with survey request and externally triggered scans.
+	Fix issue with RSSI fallback when setting CQM threshold fails.
+	Fix issue with FT-over-Air without offchannel support.
+	Add support for per station Affinities property.
+
 ver 2.20:
 	Fix issue with PKEX timeout and number of frequencies used.
 	Fix issue with handling logic for handshake failures.
diff --git a/configure.ac b/configure.ac
index 71f0cc02..c76e1c2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([iwd],[2.20])
+AC_INIT([iwd],[2.21])
 
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_AUX_DIR(build-aux)