diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 853b28a6..00000000
--- a/.bzrignore
+++ /dev/null
@@ -1,9 +0,0 @@
-config/NaturalDocs/Data
-docs/dev/*
-docs/user/*
-docs/test-coverage/db
-docs/test-coverage/html
-release
-snapshot
-.DS_Store
-build
diff --git a/.gitignore b/.gitignore
index 1377554e..4ca924ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,10 @@
 *.swp
+config/NaturalDocs/Data
+docs/dev/*
+docs/user/*
+docs/test-coverage/db
+docs/test-coverage/html
+release
+snapshot
+.DS_Store
+build
diff --git a/Changelog b/Changelog
index bb035037..b957e6b1 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 Changelog for Percona Toolkit
 
+v2.2.16 released 2015-11-09
+
   * Fixed bug 1452895: pt-archiver dies with "MySQL server has gone away" when innodb_kill_idle_transaction set to low value and bulk insert/delete process takes too long time
   * Fixed bug 1488685: pt-kill option --filter does not work
   * Feature   1402051: pt-online-schema-change should reconnect to slaves
diff --git a/Makefile.PL b/Makefile.PL
index 77a3adbb..db88a389 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;
 
 WriteMakefile(
     NAME      => 'percona-toolkit',
-    VERSION   => '2.2.15',
+    VERSION   => '2.2.16',
     EXE_FILES => [ <bin/*> ],
     MAN1PODS  => {
       'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',
diff --git a/bin/pt-align b/bin/pt-align
index e1c1d2f4..2ed26f45 100755
--- a/bin/pt-align
+++ b/bin/pt-align
@@ -1331,6 +1331,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-align 2.2.15
+pt-align 2.2.16
 
 =cut
diff --git a/bin/pt-archiver b/bin/pt-archiver
index 04db7119..4c6ccafc 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -8386,6 +8386,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-archiver 2.2.15
+pt-archiver 2.2.16
 
 =cut
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 9e0ce62d..db019661 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -5789,6 +5789,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-config-diff 2.2.15
+pt-config-diff 2.2.16
 
 =cut
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index 2a7a24b6..71893868 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -5580,6 +5580,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-deadlock-logger 2.2.15
+pt-deadlock-logger 2.2.16
 
 =cut
diff --git a/bin/pt-diskstats b/bin/pt-diskstats
index 320550e0..a7461212 100755
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -5591,6 +5591,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-diskstats 2.2.15
+pt-diskstats 2.2.16
 
 =cut
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index 7aacf3b0..ef9aa963 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -5631,6 +5631,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-duplicate-key-checker 2.2.15
+pt-duplicate-key-checker 2.2.16
 
 =cut
diff --git a/bin/pt-fifo-split b/bin/pt-fifo-split
index acf6bc7e..462f7dd0 100755
--- a/bin/pt-fifo-split
+++ b/bin/pt-fifo-split
@@ -1620,6 +1620,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-fifo-split 2.2.15
+pt-fifo-split 2.2.16
 
 =cut
diff --git a/bin/pt-find b/bin/pt-find
index ff65a2e3..f9e08835 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -5001,6 +5001,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-find 2.2.15
+pt-find 2.2.16
 
 =cut
diff --git a/bin/pt-fingerprint b/bin/pt-fingerprint
index e1be8726..9fe63362 100755
--- a/bin/pt-fingerprint
+++ b/bin/pt-fingerprint
@@ -2211,6 +2211,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-fingerprint 2.2.15
+pt-fingerprint 2.2.16
 
 =cut
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index 523d2c55..6a8c409d 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -4566,6 +4566,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-fk-error-logger 2.2.15
+pt-fk-error-logger 2.2.16
 
 =cut
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index f42db276..5aaeb4eb 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -6241,6 +6241,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-heartbeat 2.2.15
+pt-heartbeat 2.2.16
 
 =cut
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index 07621ba1..f39afff3 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -7565,6 +7565,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-index-usage 2.2.15
+pt-index-usage 2.2.16
 
 =cut
diff --git a/bin/pt-ioprofile b/bin/pt-ioprofile
index 359f1f8d..3e35a526 100755
--- a/bin/pt-ioprofile
+++ b/bin/pt-ioprofile
@@ -1125,7 +1125,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-ioprofile 2.2.15
+pt-ioprofile 2.2.16
 
 =cut
 
diff --git a/bin/pt-kill b/bin/pt-kill
index 0cace6ce..71d2e6e0 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -8280,6 +8280,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-kill 2.2.15
+pt-kill 2.2.16
 
 =cut
diff --git a/bin/pt-mext b/bin/pt-mext
index 1eb81eaa..e27ace87 100755
--- a/bin/pt-mext
+++ b/bin/pt-mext
@@ -801,7 +801,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-mext 2.2.15
+pt-mext 2.2.16
 
 =cut
 
diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary
index c9d45e68..2a4c4ff6 100755
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -3102,7 +3102,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-mysql-summary 2.2.15
+pt-mysql-summary 2.2.16
 
 =cut
 
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index dcf5838b..106d0f3b 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -12074,6 +12074,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-online-schema-change 2.2.15
+pt-online-schema-change 2.2.16
 
 =cut
diff --git a/bin/pt-pmp b/bin/pt-pmp
index 78e7f6d0..5ad9f902 100755
--- a/bin/pt-pmp
+++ b/bin/pt-pmp
@@ -895,7 +895,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-pmp 2.2.15
+pt-pmp 2.2.16
 
 =cut
 
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 54c0bad4..6de5dd54 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -16650,6 +16650,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-query-digest 2.2.15
+pt-query-digest 2.2.16
 
 =cut
diff --git a/bin/pt-show-grants b/bin/pt-show-grants
index 4cc853c2..9b4ad58f 100755
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -2416,6 +2416,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-show-grants 2.2.15
+pt-show-grants 2.2.16
 
 =cut
diff --git a/bin/pt-sift b/bin/pt-sift
index 882422e1..2838bb59 100755
--- a/bin/pt-sift
+++ b/bin/pt-sift
@@ -1243,7 +1243,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-sift 2.2.15
+pt-sift 2.2.16
 
 =cut
 
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index 0171322a..6941777c 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -4883,6 +4883,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-delay 2.2.15
+pt-slave-delay 2.2.16
 
 =cut
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
index f5babd44..628d5457 100755
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -4378,6 +4378,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-find 2.2.15
+pt-slave-find 2.2.16
 
 =cut
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index aaf56b1b..8228f5f9 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -5951,6 +5951,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-slave-restart 2.2.15
+pt-slave-restart 2.2.16
 
 =cut
diff --git a/bin/pt-stalk b/bin/pt-stalk
index 386fecca..1442263e 100755
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -2251,7 +2251,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-stalk 2.2.15
+pt-stalk 2.2.16
 
 =cut
 
diff --git a/bin/pt-summary b/bin/pt-summary
index ed01e43b..efe64cab 100755
--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -2696,7 +2696,7 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-summary 2.2.15
+pt-summary 2.2.16
 
 =cut
 
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 6386a55c..c2ec2bf6 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -12937,6 +12937,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-table-checksum 2.2.15
+pt-table-checksum 2.2.16
 
 =cut
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 966904db..93bc8c69 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -12799,6 +12799,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-table-sync 2.2.15
+pt-table-sync 2.2.16
 
 =cut
diff --git a/bin/pt-table-usage b/bin/pt-table-usage
index c4b5ccd0..d7ef8d23 100755
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -7578,6 +7578,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-table-usage 2.2.15
+pt-table-usage 2.2.16
 
 =cut
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index cede66d9..0ad4722f 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -11309,6 +11309,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-upgrade 2.2.15
+pt-upgrade 2.2.16
 
 =cut
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index f41f8970..680cee46 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -6152,6 +6152,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-variable-advisor 2.2.15
+pt-variable-advisor 2.2.16
 
 =cut
diff --git a/bin/pt-visual-explain b/bin/pt-visual-explain
index 3996bb60..36abdc63 100755
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -3253,6 +3253,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-pt-visual-explain 2.2.15
+pt-visual-explain 2.2.16
 
 =cut
diff --git a/config/deb/changelog b/config/deb/changelog
index 143cdcad..9eb11623 100644
--- a/config/deb/changelog
+++ b/config/deb/changelog
@@ -1,3 +1,14 @@
+percona-toolkit (2.2.16-1) unstable; urgency=low
+
+  * Fixed bug 1452895: pt-archiver dies with "MySQL server has gone away" when innodb_kill_idle_transaction set to low value and bulk insert/delete process takes too long time
+  * Fixed bug 1488685: pt-kill option --filter does not work
+  * Feature   1402051: pt-online-schema-change should reconnect to slaves
+  * Fixed bug 1491261: pt-online-schema-change, MySQL 5.6, and InnoDB optimizer stats can cause downtime
+  * Fixed bug 1494082: pt-stalk find -warn option is not portable
+  * Feature   1389041: Document that pt-table-checksum has high likelihood to skip a table when row count is around chunk-size * chunk-size-limit
+
+ -- Percona Toolkit Developers <toolkit-dev@percona.com>  Fri, 06 Nov 2015 19:47:42 +0000
+
 percona-toolkit (2.2.15-2) unstable; urgency=low
 
   * Fixed bug 1056507: pt-archiver checked lag too frequently
diff --git a/config/sphinx-build/conf.py b/config/sphinx-build/conf.py
index 6371e9b2..a4df4066 100644
--- a/config/sphinx-build/conf.py
+++ b/config/sphinx-build/conf.py
@@ -50,7 +50,7 @@ copyright = u'2015, Percona LLC and/or its affiliates'
 # The short X.Y version.
 version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.15'
+release = '2.2.16'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/percona-toolkit.pod b/docs/percona-toolkit.pod
index 96d75247..866adb48 100644
--- a/docs/percona-toolkit.pod
+++ b/docs/percona-toolkit.pod
@@ -557,6 +557,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-Percona Toolkit v2.2.15 released 2015-08-28
+Percona Toolkit v2.2.16 released 2015-11-06
 
 =cut
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index 553bbc69..9e78a717 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1,6 +1,35 @@
 Release Notes
 *************
 
+v2.2.16 released 2015-11-09
+===========================
+
+Percona Toolkit 2.2.16 has been released. This release contains 3 new features and 2 bug fixes.
+
+New Features:
+
+* 1491261: When using MySQL 5.6 or later, and ``innodb_stats_persistent`` option is enabled (by default, it is enabled), then ``pt-online-schema-change`` will now run with the ``--analyze-before-swap`` option. This ensures that queries continue to use correct execution path, instead of switching to full table scan, which could cause possible downtime. If you do not want ``pt-online-schema-change`` to run ``ANALYZE`` on new tables before the swap, you can disable this behavior using the ``--no-analyze-before-swap`` option.
+
+* 1402051: ``pt-online-schema-change`` will now wait forever for slaves to be available and not be lagging. This ensures that the tool does not abort during faults and connection problems on slaves.
+
+* 1452895: ``pt-archiver`` now issues ‘keepalive’ queries during and after bulk insert/delete process that takes a long time. This keeps the connection alive even if the ``innodb_kill_idle_transaction`` variable is set to a low value.
+
+Bug Fixes:
+
+* 1488685: The ``--filter`` option for ``pt-kill`` now works correctly.
+
+* 1494082: The ``pt-stalk`` tool no longer uses the ``-warn`` option when running ``find``, because the option is not supported on FreeBSD.
+
+Changelog
+---------
+
+* Fixed bug 1452895: pt-archiver dies with "MySQL server has gone away" when innodb_kill_idle_transaction set to low value and bulk insert/delete process takes too long time
+* Fixed bug 1488685: pt-kill option --filter does not work
+* Feature   1402051: pt-online-schema-change should reconnect to slaves
+* Fixed bug 1491261: pt-online-schema-change, MySQL 5.6, and InnoDB optimizer stats can cause downtime
+* Fixed bug 1494082: pt-stalk find -warn option is not portable
+* Feature   1389041: Document that pt-table-checksum has high likelihood to skip a table when row count is around chunk-size * chunk-size-limit
+
 v2.2.15 released 2015-08-28
 ===========================