diff --git a/CHANGELOG.md b/CHANGELOG.md
index be9b546d09..ffec3d2bfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,32 @@
-# Changelog for unreleased
-
-The following sections list the changes for unreleased.
+# Changes in unreleased
 
 ## Summary
 
- * Chg #1: Initial release of basic version
- * Chg #11: Upgrade micro libraries
+* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-ocs/issues/1)
+* Change - Upgrade micro libraries: [#11](https://github.com/owncloud/ocis-ocs/issues/11)
+* Enhancement - Configuration: [#14](https://github.com/owncloud/ocis-ocs/pull/14)
 
 ## Details
 
- * Change #1: Initial release of basic version
+* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-ocs/issues/1)
 
    Just prepared an initial basic version to serve OCS for the ownCloud Infinite Scale project. It
    just provides a minimal viable product to demonstrate the microservice pattern.
 
    https://github.com/owncloud/ocis-ocs/issues/1
 
- * Change #11: Upgrade micro libraries
+
+* Change - Upgrade micro libraries: [#11](https://github.com/owncloud/ocis-ocs/issues/11)
 
    Updated the micro and ocis-pkg libraries to version 2.
 
    https://github.com/owncloud/ocis-ocs/issues/11
 
 
+* Enhancement - Configuration: [#14](https://github.com/owncloud/ocis-ocs/pull/14)
+
+   Extensions should be responsible of configuring themselves. We use Viper for config loading
+   from default paths. Environment variables **WILL** take precedence over config files.
+
+   https://github.com/owncloud/ocis-ocs/pull/14
+