diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbfcb0523..b0e510aff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 # 3. If any interfaces have been added since the last public release, then increment age.
 # 4. If any interfaces have been removed since the last public release, then set age to 0.
 
-set(RMQ_SOVERSION_CURRENT   3)
-set(RMQ_SOVERSION_REVISION  3)
-set(RMQ_SOVERSION_AGE       2)
+set(RMQ_SOVERSION_CURRENT   4)
+set(RMQ_SOVERSION_REVISION  0)
+set(RMQ_SOVERSION_AGE       0)
 
 math(EXPR RMQ_SOVERSION_MAJOR "${RMQ_SOVERSION_CURRENT} - ${RMQ_SOVERSION_AGE}")
 math(EXPR RMQ_SOVERSION_MINOR "${RMQ_SOVERSION_AGE}")
diff --git a/ChangeLog.md b/ChangeLog.md
index 6907e7607..45774d66e 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,13 @@
 # Change Log
+## Changes since v0.5.2 (a.k.a., v0.6.0)
+- `e1746f9` Tools: Enable support for SSL in tools.
+- `9626dd5` Lib: ABI CHANGE: enable support for auto_delete, internal flags to
+     amqp_exchange_declare
+- `ee54e27`, `656f833` Lib: check for double-close in SSL/TCP socket impl
+- `cf2760d` Lib: allocate struct when method has no field.
+- `513ad4a` Lib: add support for SANs in OpenSSL socket impl.
+- `5348c69` Lib: add functions to get negotiated frame_max and heartbeat parms.
+
 ## Changes since v0.5.1 (a.k.a., v0.5.2)
 - `fcdf0f8` Autoconf: check for htonll as declaration in a header file
 - `5790ec7` SSL: correctly report hostname verification errors.
diff --git a/README.md b/README.md
index ef072f8da..00efce30f 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ rabbitmq-discuss mailing list:
 
 ## Latest Stable Version
 
-The latest stable release of [rabbitmq-c is v0.5.2](https://github.com/alanxz/rabbitmq-c/releases/tag/v0.5.2).
+The latest stable release of [rabbitmq-c is v0.6.0](https://github.com/alanxz/rabbitmq-c/releases/tag/v0.6.0).
 A complete list of changes can be found in the [Change Log](ChangeLog.md)
 
 The v0.5.2 source tarball can be downloaded from:
diff --git a/configure.ac b/configure.ac
index 658f3874b..a0600d305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 AC_PREREQ([2.59])
 
 m4_define([major_version], [0])
-m4_define([minor_version], [5])
-m4_define([micro_version], [3])
+m4_define([minor_version], [6])
+m4_define([micro_version], [0])
 
 # Follow all steps below in order to calculate new ABI version when updating the library
 # NOTE: THIS IS UNRELATED to the actual project version
@@ -12,9 +12,9 @@ m4_define([micro_version], [3])
 # 2. If any interfaces have been added, removed, or changed since the last update, increment current and set revision to 0.
 # 3. If any interfaces have been added since the last public release, then increment age.
 # 4. If any interfaces have been removed since the last public release, then set age to 0.
-m4_define([soversion_current],   [3])
-m4_define([soversion_revision],  [3])
-m4_define([soversion_age],       [2])
+m4_define([soversion_current],   [4])
+m4_define([soversion_revision],  [0])
+m4_define([soversion_age],       [0])
 
 AC_INIT([rabbitmq-c], [major_version.minor_version.micro_version],
 	[https://github.com/alanxz/rabbitmq-c/issues], [rabbitmq-c],
diff --git a/librabbitmq/amqp.h b/librabbitmq/amqp.h
index 20fa642fa..13a91760a 100644
--- a/librabbitmq/amqp.h
+++ b/librabbitmq/amqp.h
@@ -223,9 +223,9 @@ AMQP_BEGIN_DECLS
  */
 
 #define AMQP_VERSION_MAJOR 0
-#define AMQP_VERSION_MINOR 5
-#define AMQP_VERSION_PATCH 3
-#define AMQP_VERSION_IS_RELEASE 0
+#define AMQP_VERSION_MINOR 6
+#define AMQP_VERSION_PATCH 0
+#define AMQP_VERSION_IS_RELEASE 1
 
 
 /**