--- a/NEWS	Mon Sep 23 04:25:16 2013 +0300
+++ b/NEWS	Wed Sep 25 10:06:08 2013 +0300
@@ -1,3 +1,24 @@
+v2.2.6 2013-09-25  Timo Sirainen <tss@iki.fi>
+
+	* acl: If public/shared namespace has a shared subscriptions file for
+	  all users, don't list subscription entries that are not visible to
+	  the user accessing it.
+
+	+ doveadm: Added "auth lookup" command for doing passdb lookup.
+	+ login_log_format_elements: Added %{orig_user}, %{orig_username}
+	  and %{orig_domain} expanding to the username exactly as sent by
+	  the client (before any changes auth process made).
+	+ Added ssl_prefer_server_ciphers setting.
+	+ auth_verbose_passwords: Log the password also for unknown users.
+	+ Linux: Added optional support for SO_REUSEPORT with
+	  inet_listener { reuse_port=yes }
+	- director: v2.2.5 changes caused "SYNC lost" errors
+	- dsync: Many fixes and error handling improvements
+	- doveadm -A: Don't waste CPU by doing a separate config lookup
+	  for each user
+	- Long-running ssl-params process no longer prevents Dovecot restart
+	- mbox: Fixed mailbox_list_index=yes to work correctly
+
 v2.2.5 2013-08-05  Timo Sirainen <tss@iki.fi>
 
 	+ SSL: Added support for ECDH/ECDHE cipher suites (by David Hicks)

--- a/TODO	Mon Sep 23 04:25:16 2013 +0300
+++ b/TODO	Wed Sep 25 10:06:08 2013 +0300
@@ -1,8 +1,5 @@
  - dsync: delete foo, rename bar foo -> foo, foo-temp-1
  - dsync+imapc:
-     - half-sync [-1], which is the same as normal sync except the other side
-       doesn't do anything (so when migrating from imapc, don't push changes
-       back to it)
      - mailbox list could be synced pretty optimally by ignoring
        (name, uidvalidity) matches. for the left if uidvalidities are unique
        and can be matched -> rename mailbox.

--- a/configure.ac	Mon Sep 23 04:25:16 2013 +0300
+++ b/configure.ac	Wed Sep 25 10:06:08 2013 +0300
@@ -2,8 +2,8 @@
 
 # Be sure to update ABI version also if anything changes that might require
 # recompiling plugins. Most importantly that means if any structs are changed.
-AC_INIT([Dovecot],[2.2.5],[dovecot@dovecot.org])
-AC_DEFINE_UNQUOTED([DOVECOT_ABI_VERSION], "2.2.ABIv5($PACKAGE_VERSION)", [Dovecot ABI version])
+AC_INIT([Dovecot],[2.2.6],[dovecot@dovecot.org])
+AC_DEFINE_UNQUOTED([DOVECOT_ABI_VERSION], "2.2.ABIv6($PACKAGE_VERSION)", [Dovecot ABI version])
 
 AC_CONFIG_SRCDIR([src])