diff --git a/CHANGELOG.md b/CHANGELOG.md
index b45e0ac0..b2b4c230 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,24 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.12.0] - 2018-04-12
+### Added
+- 11b42c0: Option to disable AOF or to use a custom path: #220 #223 #297 (@sign0, @umpc, @fmr683, @zhangfeng158)
+- #296: Add Meta data to hooks command (@tobilg)
+
+### Changes
+- 11b42c0: Updated help menu and show more options
+
+### Fixed
+- #295: Intersects returning nothing in some cases (@fils)
+- #294: HTTP requests stopped working (@zhangfeng158)
+- 0aa04a1: Lotsa package not vendored
+
 ## [1.11.1] - 2018-03-16
 ### Added
 - #272: Preserve Docker image tag history (@gechr)
-- 9428b84: Added cpu and threads to SERVER stats 
+- 9428b84: Added cpu and threads to SERVER stats
+
 ### Fixed
 - #281: Linestring intersection failure (@contra)
 - #280: Filter id match before kNN results (@sweco-semtne)
@@ -15,6 +29,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.11.0] - 2018-03-05
 ### Added
 - #221: Add WHEREEVAL clause to scan/search commands (@rshura)
+
 ### Fixed
 - #254: Add maxmemory protection to FSET (@rshura)
 - #258: Clear expires on reset (@zycbobby)
diff --git a/README.md b/README.md
index 5534a573..62d3fbc4 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 </p>
 <p align="center">
 <a href="http://tile38.com/slack"><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.11.1-green.svg?" alt="Version"></a>
+<a href="https://github.com/tidwall/tile38/releases"><img src="https://img.shields.io/badge/version-1.12.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 3f525d4f..4e3e2cce 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.11.1"
+VERSION="1.12.0"
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 11192c42..ea216ed0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.4
 
-ENV TILE38_VERSION 1.11.1
+ENV TILE38_VERSION 1.12.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