diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000000000000000000000000000000000..cd1fc56101a545b23d6402e3a64358f96d1dbb7d
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,40 @@
+# 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]
+
+### Changed
+
+- Made DSpace user configurable through environment variable
+
+### Removed
+
+- Removed link to Anonymous Privacy Policy from Shibboleth Metadata
+
+## [1.1] - 2018-06-15
+
+### Added
+
+- Added a link to the issue tracker to FAQ
+
+### Changed
+
+- Mails are now sent with a no-reply reply-to address to make it more obvious that you cannot reply to them.
+- Exchanged example item in various documentation pages with PAISÁ.
+- Changed Dockerfile to pre-fetch Maven dependencies. This should reduce build time for most cases.
+
+### Fixed
+
+- Citation is now correctly showing authors and title in addition to the PID.
+
+
+## [1.0] - 2018-05-25
+
+This is the first release. It all starts here.
+
+[Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...HEAD
+[1.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.0...v1.1
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 0000000000000000000000000000000000000000..21eb54cf42834d5d01a587d5fb356427dd7ba714
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,5 @@
+# CONTRIBUTORS
+
+* **[Alexander König](https://gitlab.inf.unibz.it/Alexander.Koenig)**
+
+* **[egon w. stemle](https://gitlab.inf.unibz.it/egon.stemle)**
diff --git a/changelog.txt b/changelog.txt
deleted file mode 100644
index cac070f947f078c68852aab5b220206e57fccf40..0000000000000000000000000000000000000000
--- a/changelog.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Releases
-========
-
-gitlab.scientificnet.org:4567/commul/dspace/dspace
-
-0.3
-added dspace-entrypoint.sh v0.2
-
-0.2
-Removed DSpace's installation from the Dockerfile.
-Moved commul-customization into /tmp , so is possible to mount external volumes into /opt/repository/ and then  copying files again from /tmp
-
-0.1
-Original build from https://github.com/commul/clarin-dspace-docker @ e5ad160
-
-
-gitlab.scientificnet.org:4567/commul/dspace/postgres
-
-0.3
-added env variables
-
-0.2
-
-0.1
-Original build from https://github.com/commul/clarin-dspace-docker @ e5ad160