diff --git a/MANIFEST.in b/MANIFEST.in
index 5513a10fdf..ee6cdbbd6f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,7 @@
 include test-requirements.txt
 include requirements.txt
 include README.md
+include README.rst
 include LICENSE
 recursive-include tests *.py
 recursive-include tests/unit/testdata *
diff --git a/docker/version.py b/docker/version.py
index 4efc6ebe08..546d9aa686 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "1.8.0-dev"
+version = "1.8.0-rc1"
 version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
diff --git a/docs/change_log.md b/docs/change_log.md
index c5637d6851..fc37ba0156 100644
--- a/docs/change_log.md
+++ b/docs/change_log.md
@@ -1,6 +1,48 @@
 Change Log
 ==========
 
+1.8.0
+-----
+
+[List of PRs / issues for this release](https://github.com/docker/docker-py/issues?q=milestone%3A1.8.0+is%3Aclosed)
+
+### Features
+
+* Added `Client.update_container` method (Update resource configs of a
+  container)
+* Added support for gzipped context in `Client.build`
+* Added ability to specify IP address when connecting a container to a
+  network
+* Added `tmpfs` support to `Client.create_host_config`
+* Added support for the `changes` param in `Client.commit`
+* Added support for the `follow` param in `Client.logs`
+* Added support for the `check_duplicate` param in `Client.create_network`
+* Added support for the `decode` param in `Client.push` and `Client.pull`
+* Added `docker.from_env` shortcut function. Instantiates a client with
+  `kwargs_from_env`
+* `kwargs_from_env` now supports an optional `environment` parameter.
+  If present, values will be fetched from this dictionary instead of
+  `os.environ`
+
+
+### Bugfixes
+
+* Fixed a bug where some environment variables specified through
+  `create_container` would be improperly formatted
+* Fixed an issue where the default TLS version in TLSConfig would
+  break in some environments. `docker-py` now uses TLSv1 by default
+  This setting can be overridden using the `ssl_version` param in
+  `kwargs_from_env` or the `TLSConfig` constructor
+* Fixed a bug where using the unix socket connection would raise
+  an error in some edge-case situations
+* Fixed a bug where `tcp` hosts would fail to connect to TLS-enabled
+  endpoints.
+
+### Miscellaneous
+
+* Default API version is now 1.22 (introduced in Docker 1.10.0)
+
+
 1.7.2
 -----