diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac30b39bb0..6fe4007888 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Summary
 
 * Change - Initial release of basic version: [#2](https://github.com/owncloud/ocis/issues/2)
+* Change - Start ocis-proxy with the ocis server command: [#119](https://github.com/owncloud/ocis/issues/119)
 
 ## Details
 
@@ -13,3 +14,12 @@
 
    https://github.com/owncloud/ocis/issues/2
 
+
+* Change - Start ocis-proxy with the ocis server command: [#119](https://github.com/owncloud/ocis/issues/119)
+
+   Starts the proxy in single binary mode (./ocis server) on port 9200. The proxy serves as a
+   single-entry point for all http-clients.
+
+   https://github.com/owncloud/ocis/issues/119
+   https://github.com/owncloud/ocis/issues/136
+