diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe039ba4c4..b629f50b07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,14 +3,16 @@ All notable changes to this project are documented below.
 
 The format is based on [keep a changelog](http://keepachangelog.com/) and this project uses [semantic versioning](http://semver.org/).
 
-## [Unreleased]
+## [1.4.0] - 2017-12-16
 ### Changed
 - Nakama will now log an error and refuse to start if the schema is outdated.
 - Drop unused leaderboard 'next' and 'previous' fields.
 - A user's 'last online at' field now contains a current UTC milliseconds timestamp if they are currently online.
-- Storage remove operations now ignore records that don't exist.
 - Fields that expect JSON content now allow up to 32kb of data.
 
+### Fixed
+- Storage remove operations now ignore records that don't exist.
+
 ## [1.3.0] - 2017-11-21
 ### Added
 - Improve graceful shutdown behaviour by ensuring the server stops accepting connections before halting other components.
diff --git a/Makefile b/Makefile
index a612270447..255e9ac874 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 BINNAME := nakama
-VERSION := 1.4.0-dev
+VERSION := 1.4.0
 BUILDDIR := build
 COMMITID := $(shell git rev-parse --short HEAD 2>/dev/null || echo nosha)
 DOCKERDIR := install/docker/nakama