diff --git a/CHANGELOG.md b/CHANGELOG.md
index 548e8d741..502772f40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The following sections list the changes for unreleased.
 ## Summary
 
  * Chg #1: Initial release of basic version
+ * Enh #14: Configuration
 
 ## Details
 
@@ -15,4 +16,11 @@ The following sections list the changes for unreleased.
 
    https://github.com/owncloud/ocis-webdav/issues/1
 
+ * Enhancement #14: Configuration
+
+   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-webdav/pull/14
+