diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 023ef01..4f98a68 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,26 @@
 Full release notes, with more details and upgrade information, are available at:
 https://channels.readthedocs.io/en/latest/releases
 
+1.1.4 (2017-06-15)
+------------------
+
+* Pending messages correctly handle retries in backlog situations
+
+* Workers in threading mode now respond to ctrl-C and gracefully exit.
+
+* ``request.meta['QUERY_STRING']`` is now correctly encoded at all times.
+
+* Test client improvements
+
+* ``ChannelServerLiveTestCase`` added, allows an equivalent of the Django
+  ``LiveTestCase``.
+
+* Decorator added to check ``Origin`` headers (``allowed_hosts_only``)
+
+* New ``TEST_CONFIG`` setting in ``CHANNEL_LAYERS`` that allows varying of
+  the channel layer for tests (e.g. using a different Redis install)
+
+
 1.1.3 (2017-04-05)
 ------------------
 
@@ -9,6 +29,7 @@ https://channels.readthedocs.io/en/latest/releases
 
 * ASGI channel layer versions are now explicitly checked for version compatability
 
+
 1.1.2 (2017-04-01)
 ------------------
 
diff --git a/channels/__init__.py b/channels/__init__.py
index b6451b1..9952fe4 100644
--- a/channels/__init__.py
+++ b/channels/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 
 default_app_config = 'channels.apps.ChannelsConfig'
 DEFAULT_CHANNEL_LAYER = 'default'
diff --git a/docs/releases/1.1.4.rst b/docs/releases/1.1.4.rst
new file mode 100644
index 0000000..c57ff61
--- /dev/null
+++ b/docs/releases/1.1.4.rst
@@ -0,0 +1,37 @@
+1.1.4 Release Notes
+===================
+
+Channels 1.1.4 is a bugfix release for the 1.1 series, released on
+June 15th, 2017.
+
+
+Major Changes
+-------------
+
+None.
+
+
+Minor Changes & Bugfixes
+------------------------
+
+* Pending messages correctly handle retries in backlog situations
+
+* Workers in threading mode now respond to ctrl-C and gracefully exit.
+
+* ``request.meta['QUERY_STRING']`` is now correctly encoded at all times.
+
+* Test client improvements
+
+* ``ChannelServerLiveTestCase`` added, allows an equivalent of the Django
+  ``LiveTestCase``.
+
+* Decorator added to check ``Origin`` headers (``allowed_hosts_only``)
+
+* New ``TEST_CONFIG`` setting in ``CHANNEL_LAYERS`` that allows varying of
+  the channel layer for tests (e.g. using a different Redis install)
+
+
+Backwards Incompatible Changes
+------------------------------
+
+None.
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index a5740cc..d9d2d64 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -12,3 +12,4 @@ Release Notes
    1.1.1
    1.1.2
    1.1.3
+   1.1.4
diff --git a/js_client/package.json b/js_client/package.json
index 26f7d77..a259ff2 100644
--- a/js_client/package.json
+++ b/js_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "django-channels",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "",
   "repository": {
     "type": "git",