diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000000000000000000000000000000000..0130d91ef3e6df7ac5e9f8a31c6cabca684cc85e
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,36 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+
+
+## [Unreleased]
+
+### Added
+- An `auth_token` parameter for `caosdb.configure_connection(...)`. This parameter accepts a plain text auth token (which can only be issued by the CaosDB Server). Under the hood, auth tokens are stored plain, instead of urlencoded now.
+- New type of exception: `ConfigurationException` for misconfigurations.
+- Some unit tests, mainly for the `caosdb.connection.authentication` module
+
+### Changed
+- [pytest](https://docs.pytest.org/en/latest/) is the new preferred unit test frame work.
+- If a password is specified in the configuration even though the password_method is not set to `plain`, a warning is logged.
+- Under the hood, the password of from a `pass` or `keyring` call is not stored anymore. Instead the password is requested each time a login is necessary.
+
+
+### Deprecated
+- Unit test frame work: [Nose](https://nose.readthedocs.io/en/latest/) should not be used anymore. Please use [pytest](https://docs.pytest.org/en/latest/) instead.
+
+### Fixed
+- #1 - Problems with pass as a credentials provider
+
+
+
+## [0.1.0] - 2018-10-09
+Tag `v0.1` - Commit 6fc0dcaa
+
+
+### Added
+- everything