diff --git a/CHANGES b/CHANGES
index 2a7c84b43dfa28c3cf606cd29a8a2723d0a4d641..863cc5cd09b8d8574b35a13a35e7c35e7e65a427 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.2 Change Log
 
-OpenLDAP 2.2.22 Engineering
+OpenLDAP 2.2.22 Release
+	Fixed slapd extensibleMatch empty DN bug (ITS#3506)
 
 OpenLDAP 2.2.21 Release
 	Fixed slapd group limits
diff --git a/build/version.var b/build/version.var
index 1b8297b658099da16641727a8a06e6e852e5469c..4465ae24499904620bc7e8e63a495c2bcfb1c66e 100644
--- a/build/version.var
+++ b/build/version.var
@@ -15,9 +15,9 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=2
-ol_patch=X
-ol_api_inc=20221
+ol_patch=22
+ol_api_inc=20222
 ol_api_current=7
-ol_api_revision=14
+ol_api_revision=15
 ol_api_age=0
 ol_release_date="2005/01/21"