diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50673f7e..b7bb746d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,34 +2,38 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.17.6] - 2019-08-22
+## [1.18.0] = 2019-10-09
+### Enhancement
+- 639f6e2: Updated the spatial index (R-tree) implementation.
 
+### Fixes
+- b092cea: Fixed MQTT blocking on publish/wait.
+- #496: Fixed MQTT client ID uniqueness. (@neterror)
+- #497: Fixed data race on webhook map with TTLs. (@belek)
+- #498: Fixed JSET cancels objects TTL expiry value. (@belek)
+
+## [1.17.6] - 2019-08-22
 ### Fixes
 - 3d96b17: Fixed periodic stop-the-world pauses for systems with large heaps.
 
 ## [1.17.5] - 2019-08-22
-
 ### Fixes
 - #489: Fixed nearby count always one (@jkarjala)
 
 ## [1.17.4] - 2019-08-09
-
 ### Fixes
 - #486: Fixed data condition on connections map (@saltatory)
 
 ## [1.17.3] - 2019-08-03
-
 ### Fixes
 - #483: Fixed lua pool pruning (@rshura)
 - f7888c1: Fixed malformed json for chans command
 
 ## [1.17.2] - 2019-06-28
-
 ### Fixes
 - #422: Fixes NEARBY command distance normalization issue (@TrivikrAm-Pamarthi, @melbania)
 
 ## [1.17.1] - 2019-05-04
-
 ### Fixes
 - #448: Fixed missing commands for unsubscribing from active channel (@githubfr)
 - #454: Fixed colored output for fatalf (@olevole)
diff --git a/README.md b/README.md
index a78e753d..dbbe7dde 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 </p>
 <p align="center">
 <a href="https://join.slack.com/t/tile38/shared_invite/enQtMzQ0OTEwMDUxMzc5LTc0NTJjZmM3YjFhOGZiZGU2NDNjOWEwM2Q5ZWE3MzFiYWZkZDIyN2U2ZmUzZDBmODU0MjI1ZjQ0N2Y1M2I1NTg"><img src="https://img.shields.io/badge/slack-channel-orange.svg" alt="Slack Channel"></a>
-<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.17.6-green.svg?" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.18.0-green.svg?" alt="Version"></a>
 <a href="https://travis-ci.org/tidwall/tile38"><img src="https://travis-ci.org/tidwall/tile38.svg?branch=master" alt="Build Status"></a>
 <a href="https://hub.docker.com/r/tile38/tile38"><img src="https://img.shields.io/badge/docker-ready-blue.svg" alt="Docker Ready"></a>
 </p>
diff --git a/build.sh b/build.sh
index afc9243e..d61b3530 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@ set -e
 cd $(dirname "${BASH_SOURCE[0]}")
 OD="$(pwd)"
 
-VERSION=1.17.6
+VERSION=1.18.0
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package