diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47365e90c..ab03ca505 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,20 @@
-## Upcoming/Master
-
-- Add JSON and YAML codecs to file lookup
-- Improve config. validation by only allowing unrecognized keys at the top level
+## Upcoming Release
+
+## 1.4.0 (2018-08-05)
+
+- YAML & JSON codecs for `file` lookup [GH-537]
+- Arbitrary `command` hook [GH-565]
+- Fix datetime is not JSON serializable error [GH-591]
+- Run dump and outline actions offline [GH-594]
+- Helper Makefile for functional tests [GH-597]
+- Python3 support!!! [GH-600]
+- YAML blueprint testing framework [GH-606]
+- new `add_output` helper on Blueprint [GH-611]
+- Include lookup contents when lookups fail [GH-614]
+- Fix issue with using previous value for parameters [GH-615]
+- Stricter config parsing - only allow unrecognized config variables at the top-level [GH-623]
+- Documentation for the `default` lookup [GH-636]
+- Allow configs without stacks [GH-640]
 
 ## 1.3.0 (2018-05-03)
 
diff --git a/setup.py b/setup.py
index 85b84068a..b86baf4b0 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = "1.3.0"
+VERSION = "1.4.0"
 
 src_dir = os.path.dirname(__file__)
 
diff --git a/stacker/__init__.py b/stacker/__init__.py
index 8e5637fbd..8a16833a2 100644
--- a/stacker/__init__.py
+++ b/stacker/__init__.py
@@ -1,4 +1,5 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-__version__ = "1.3.0"
+
+__version__ = "1.4.0"