diff --git a/docs/changelog.rst b/docs/changelog.rst
new file mode 100644
index 0000000..c8ebed8
--- /dev/null
+++ b/docs/changelog.rst
@@ -0,0 +1,48 @@
+=========
+Changelog
+=========
+
+This changelog only contains information that might be useful to end users and
+package maintainers. For further info, see the git commit log.
+
+Version 0.1.6
+=============
+
+*unreleased*
+
+- vdirsyncer now depends on the ``icalendar`` package from PyPI, to get rid of
+  its own broken parser.
+
+- vdirsyncer now also depends on ``requests_toolbelt``. This makes it possible
+  to guess the authentication type instead of blankly assuming ``basic``.
+
+- Fix a semi-bug in caldav and carddav storages where a tuple (href, etag)
+  instead of the proper etag would have been returned from the upload method.
+  vdirsyncer might do unnecessary copying when upgrading to this version.
+
+- Add the storage :py:class:`vdirsyncer.storage.SingleFileStorage`. See issue
+  `#48`_.
+
+- The ``collections`` parameter for pair sections now accepts the special
+  values ``from a`` and ``from b`` for automatically discovering collections.
+  See :ref:`pair_config`.
+
+.. _`#48`: https://github.com/untitaker/vdirsyncer/issues/48
+
+Version 0.1.5
+=============
+
+*released on 14 May 2014*
+
+- Introduced changelogs
+
+- Many bugfixes
+
+- Many doc fixes
+
+- vdirsyncer now doesn't necessarily need UIDs anymore for syncronization.
+
+- vdirsyncer now aborts if one collection got completely emptied between
+  syncronizations. See `#42`_.
+
+.. _`#42`: https://github.com/untitaker/vdirsyncer/issues/42
diff --git a/docs/index.rst b/docs/index.rst
index dc365c6..f3e0621 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,4 +20,5 @@ Table of Contents
    keyring
    server_support
    troubleshooting
+   changelog
    license
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 6fc4412..ec11d6a 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -23,7 +23,7 @@ By default, *vdirsyncer* looks for its configuration file at
 ``~/.vdirsyncer/config``. You can use the ``VDIRSYNCER_CONFIG`` environment
 variable to change this path.
 
-The config file should start with a :ref:`general_config <general section>`,
+The config file should start with a :ref:`general section <general_config>`,
 where the only required parameter is ``status_path``. The following is a
 minimal example::