diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index f35e7ba..f5d92c6 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.1
+current_version = 2.2.2
 commit = False
 
 [bumpversion:file:CMakeLists.txt]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2176bfa..c0a4a37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ endif()
 
 # Project setup & environment variables
 
-set(PROJECT_VERSION "2.2.1")
+set(PROJECT_VERSION "2.2.2")
 set(LOCALEDIR_REL "share/locale")
 set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LOCALEDIR_REL}")
 set(GettextTranslate_ALL 1)
diff --git a/ChangeLog b/ChangeLog
index 52c1e9f..aad1d39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-06-20  Franklin "Snaipe" Mathieu  <franklinmathieu@gmail.com>
+
+    * criterion: version 2.2.2
+    * Fix: fixed deadlocks when tests are terminated too fast
+    * Fix: fixed crash during test teardown if spawning new threads in the test
+    * Fix: fixed memory leak in disabled tests
+
 2016-02-06  Franklin "Snaipe" Mathieu  <franklinmathieu@gmail.com>
 
     * criterion: version 2.2.1
diff --git a/README.md b/README.md
index 85f2c5e..cb2cc0a 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,10 @@ the user would have with other frameworks:
 
 ### Binary archives
 
-* [Linux (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.2.1/criterion-v2.2.1-linux-x86_64.tar.bz2)
-* [OS X (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.2.1/criterion-v2.2.1-osx-x86_64.tar.bz2)
-* [Windows (MSVC - x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.2.1/criterion-v2.2.1-windows-msvc-x64.tar.bz2)
-* [Windows (MinGW - x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.2.1/criterion-v2.2.1-windows-mingw-x64.tar.bz2)
+* [Linux (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.2.2/criterion-v2.2.2-linux-x64.tar.bz2)
+* [OS X (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.2.2/criterion-v2.2.2-osx-x64.tar.bz2)
+* [Windows (MSVC - x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.2.2/criterion-v2.2.2-windows-msvc-x64.tar.bz2)
+* [Windows (MinGW - x86_64)](https://github.com/Snaipe/Criterion/releases/download/v2.2.2/criterion-v2.2.2-windows-mingw-x64.tar.bz2)
 
 If you have a different platform, you can still [build the library from source](http://criterion.readthedocs.org/en/latest/setup.html#installation)
 
diff --git a/appveyor.yml b/appveyor.yml
index 6488c2d..a471bc8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.1_b{build}-{branch}
+version: 2.2.2_b{build}-{branch}
 
 os: Visual Studio 2015
 
diff --git a/doc/conf.py b/doc/conf.py
index d343469..b6c7dc3 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -39,7 +39,7 @@ copyright = u'2015, Franklin "Snaipe" Mathieu'
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.1'
+version = '2.2.2'
 # The full version, including alpha/beta/rc tags.
 release = version