diff --git a/ChangeLog.md b/ChangeLog.md
index 6cfe5c2d..a5e47380 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,25 @@
 ChangeLog
 =========
 
+0.4.0
+-----
+
+* **This version introduces breaking changes!**
+* The `base_url` parameter in the `Client` constructor should now allow most
+  of the `DOCKER_HOST` environment values (except for the fd:// protocol)
+    * As a result, URLs that don't specify a port are now invalid (similar
+    to the official client's behavior)
+* Added TLS support (see [documentation](https://github.com/dotcloud/docker-py#connection-to-daemon-using-https))
+
+### Bugfixes
+
+* Fixed an issue with `Client.build` streamed logs in Python 3
+
+### Miscellaneous
+
+* Added unit tests coverage
+* Various integration tests fixes
+
 0.3.2
 -----
 
diff --git a/docker/version.py b/docker/version.py
index c55028d8..5140fa1d 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1 +1 @@
-version = "0.3.3-dev"
+version = "0.4.0"