diff --git a/CHANGELOG.md b/CHANGELOG.md
index b45508f6..d374731c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 2017-06-07 version 2.1.2
+
+* Improve documents (#565)
+  * Fix empty map parse bug (#568)
+  * Improve build system (#569, #570, #572, #579, #591, #592)
+  * Remove some warnings (#574, #578, #586, #588)
+  * Improve cross platform configuration (#577, #582)
+  * Add cmake package config support (#580)
+  * Fix streaming unpack bug (#585)
+
 # 2017-02-04 version 2.1.1
 
   * Fix unpacker's buffer management bug (#561)
diff --git a/README.md b/README.md
index 30d9c87f..94aedfbb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================
 
-Version 2.1.1 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
+Version 2.1.2 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
 
 It's like JSON but small and fast.
 
diff --git a/appveyor.yml b/appveyor.yml
index 72c46d8a..e81563d7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.1.0.{build}
+version: 2.1.2.{build}
 
 image:
 - Visual Studio 2015
diff --git a/include/msgpack/version_master.h b/include/msgpack/version_master.h
index d1f50f87..79578569 100644
--- a/include/msgpack/version_master.h
+++ b/include/msgpack/version_master.h
@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    2
 #define MSGPACK_VERSION_MINOR    1
-#define MSGPACK_VERSION_REVISION 1
+#define MSGPACK_VERSION_REVISION 2