diff --git a/RELEASE_NOTES.markdown b/RELEASE_NOTES.markdown
index b893b75c5..81a763c64 100644
--- a/RELEASE_NOTES.markdown
+++ b/RELEASE_NOTES.markdown
@@ -1,5 +1,24 @@
 # Release Notes
 
+## 2.8.2 (October 17 2017)
+
+* [CCBC-833](https://issues.couchbase.com/browse/CCBC-833), [CCBC-834](https://issues.couchbase.com/browse/CCBC-834):
+  Update real cluster integration in the test suite.
+
+* [CCBC-860](https://issues.couchbase.com/browse/CCBC-860): cbc-connstr: Do not zero out C++ instances.
+
+* [CCBC-859](https://issues.couchbase.com/browse/CCBC-859): Fix libm shared object detection on Debian 9.
+
+* Bugs reported by [clang analyzer](http://clang-analyzer.llvm.org/):
+
+  * [CCBC-858](https://issues.couchbase.com/browse/CCBC-858): Fix memory leak for compressed packet.
+  * [CCBC-857](https://issues.couchbase.com/browse/CCBC-857): Fix possible NULL pointer dereference in `mcreq_reserve_key`.
+  * [CCBC-856](https://issues.couchbase.com/browse/CCBC-856): Initialize response struct in `H_config`.
+  * [CCBC-855](https://issues.couchbase.com/browse/CCBC-855): Fix dead assignments in `contrib/genhash`.
+  * [CCBC-854](https://issues.couchbase.com/browse/CCBC-854): Init vbguess array before entry lookup.
+  * [CCBC-853](https://issues.couchbase.com/browse/CCBC-853): cbc-proxy: do not use client object after free.
+  * [CCBC-852](https://issues.couchbase.com/browse/CCBC-852): Do not free memory twice in N1QL index manager.
+
 ## 2.8.1 (September 20 2017)
 
 * Check nodes number for durability checks. The store with durability
diff --git a/cmake/Modules/GetVersionInfo.cmake b/cmake/Modules/GetVersionInfo.cmake
index fc57f4f2f..a98e573e2 100644
--- a/cmake/Modules/GetVersionInfo.cmake
+++ b/cmake/Modules/GetVersionInfo.cmake
@@ -42,13 +42,13 @@ ENDIF()
 
 IF (NOT LCB_VERSION)
     SET(LCB_NOGITVERSION ON)
-    SET(LCB_VERSION "2.8.1")
+    SET(LCB_VERSION "2.8.2")
 ENDIF()
 IF (NOT LCB_VERSION_CHANGESET)
     SET(LCB_VERSION_CHANGESET "0xdeadbeef")
 ENDIF()
 IF (NOT LCB_VERSION_HEX)
-    SET(LCB_VERSION_HEX 0x020801)
+    SET(LCB_VERSION_HEX 0x020802)
 ENDIF()
 
 # Now parse the version string
@@ -63,7 +63,7 @@ IF(APPLE)
 ELSE()
     SET(LCB_SONAME_MAJOR "2")
 ENDIF()
-SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.49")
+SET(LCB_SONAME_FULL "${LCB_SONAME_MAJOR}.0.50")
 
 MESSAGE(STATUS
     "libcouchbase ${LCB_VERSION_MAJOR},${LCB_VERSION_MINOR},${LCB_VERSION_PATCH}")
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 7768c1f29..ef7369085 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME           = "Couchbase C Client"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.8.1
+PROJECT_NUMBER         = 2.8.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer