diff --git a/docker/version.py b/docker/version.py
index 725f180f9c737d87794aad3d42db143e4bd8c27b..72cd0e064ad44970832bcda2b779ba64dd8b7ec6 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "1.8.0-rc5"
+version = "1.8.0"
 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 fc37ba015664308046bd591a278aa32e25493f1f..f89137978cd901327598d6a6f0887797b9806c65 100644
--- a/docs/change_log.md
+++ b/docs/change_log.md
@@ -27,16 +27,19 @@ Change Log
 
 ### Bugfixes
 
-* Fixed a bug where some environment variables specified through
-  `create_container` would be improperly formatted
+* Fixed a bug where TLS verification would fail when using IP addresses
+  in the certificate's `subjectAltName` fields
 * 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 `tcp` hosts would fail to connect to TLS-enabled
+  endpoints
+* Fixed a bug where loading a valid docker configuration file would fail
+* Fixed a bug where some environment variables specified through
+  `create_container` would be improperly formatted
 * 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