diff --git a/CHANGELOG-1.1.md b/CHANGELOG-1.1.md
deleted file mode 100644
index 11a29a6d..00000000
--- a/CHANGELOG-1.1.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Changelog
-
-### v1.1 – Relay support and Schema structure
-
-#### General changes
-- Relay support added
-- Test coverage 100% added
-- `AbstractField` was introduced and `AbstractType` was changed (see [upgrade-1.2](UPGRADE-1.2.md))
-
-#### Processor
-- Processor now requires an `AbstractSchema` in `__construct`
-- `->processRequest($payload, $variables = [])` changed to `->processPayload(string $payload, $variables = [])`
-
-#### Type
-- parameter `resolve` was removed from config
-- parameter `args` was removed from config
-- parameter `fields` is now required when you create an instance of `ObjectType`
-
-#### Field
-- `AbstractField` was introduced
-- `Field` class now has to be used to define a field inside `fields` config
-- abstract `resolve` methods added
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..5ff72228
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,33 @@
+# Changelog
+
+Please update this file right before tagging a new release
+
+## Unreleased
+
+* fix some README badges
+* add a more robust implementation for `TypeService::getPropertyValue()`
+* fix PhpStorm inspection performance complaints
+* fix a bug that prevented using `null` as a default value
+* add support for error extensions
+* throw `ConfigurationException` when trying to add two types with the same name to the schema
+* add a `getImplementations()` method to `AbstractInterfaceType`, can be used to properly discover all possible types during introspection
+* run Travis CI on PHP 7.2 and 7.3 too
+* run phpstan static analysis (level 1 only) during Travis CI builds
+* rename the `Tests` directory to `tests` for consistency with other projects
+* remove some obsolete documentation
+
+## v1.6.0
+
+* fix the Travis CI build for PHP 5.5
+* improve examples somewhat
+* make `Node` stricter when validating input
+* return null not just when the field is scalar but whenever it's non-null
+
+## v1.5.5
+
+* add missing directive locations
+* add a `totalCount` field to connections
+* fix a regression introduced in #151
+* add a type/field lookup cache for improved performance
+* add support for nested deferred resolvers
+* properly handle null values in `BooleanType`