diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000000..25b73404800e
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,17 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2.6] - 2016-07-08
+
+### Added
+- Configuration for first day of the week #950
+- StyleCI configuration #929
+
+### Changed
+- Removed `invoiceninja.komodoproject` from Git #932
+- `APP_CIPHER` changed from `rinjdael-128` to `AES-256-CBC` #898 
+
+### Fixed
+- "Manual entry" untranslatable #562
+- Using a database table prefix breaks the dashboard #203
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e888da72d3bf..0c2d0bbb7327 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,8 @@ Thanks for your contributions!
  * Check if your branch is still in sync with the repositorys **`develop`** branch
    * _Read:_ [Syncing a fork](https://help.github.com/articles/syncing-a-fork/)
    * _Also read:_ [How to rebase a pull request](https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request) 
- * Push your branch and create a PR against the Invoice Ninja **`develop`** branch 
+ * Push your branch and create a PR against the Invoice Ninja **`develop`** branch
+ * Update the [Changelog](CHANGELOG.md)
 
 ### Some rules
 To make the contribution process nice and easy for anyone, please follow some rules: