diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfe60604..4256c412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.8.0] - 2017-02-21
+### Added
+- #145: TCP Keepalives option (@UriHendler)
+- #136: K nearest neighbors for NEARBY command (@m1ome, @tomquas, @joernroeder)
+- #139: Added CLIENT command (@UriHendler)
+- #133: AutoGC config option (@m1ome, @amorskoy)
+
+### Fixed
+- #147: Leaking http hook connections (@mkabischev)
+- #143: Duplicate data in hook data (@mkabischev)
+
 ## [1.7.5] - 2017-01-13
 ### Added
 - Performance bump for all SET commands, ~10% faster
diff --git a/README.md b/README.md
index 4814085d..d2c7e7c0 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 </p>
 <p align="center">
 <a href="https://gitter.im/tile38/tile38?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"><img src="https://badges.gitter.im/Join%20Chat.svg" alt="Gitter"></a>
-<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.7.5-green.svg?" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.8.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 f3440e67..76eb801b 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.7.5"
+VERSION="1.8.0"
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package
diff --git a/docker/Dockerfile b/docker/Dockerfile
index aecaf26d..ff14c3be 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4
 
-ENV TILE38_VERSION 1.7.5
+ENV TILE38_VERSION 1.8.0
 ENV TILE38_DOWNLOAD_URL https://github.com/tidwall/tile38/releases/download/$TILE38_VERSION/tile38-$TILE38_VERSION-linux-amd64.tar.gz
 
 RUN addgroup -S tile38 && adduser -S -G tile38 tile38