diff --git a/ChangeLog b/ChangeLog
index 8e7e2068..b23d6c0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+ver 2.18:
+	Fix issue with handling BSS with invalid HE capabilities.
+	Fix issue with neighbor reports with invalid country codes.
+	Fix issue with EAP-TTLS Start packets with L flag set.
+	Add support for enabling SAE for AP mode operation.
+
 ver 2.17:
 	Fix issue with handling deauthenticate on disconnect.
 	Fix issue with handling of rate estimation errors.
diff --git a/configure.ac b/configure.ac
index 06329da4..59d448a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([iwd],[2.17])
+AC_INIT([iwd],[2.18])
 
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_AUX_DIR(build-aux)