diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8c01108..5b51ec6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,24 @@ Removed
 Fixed
 Security
 
+`2.0`_
+~~~~~~
+
+Added
+
+* Explicit support for Python 3.6 (no changes were necessary)
+
+Removed
+
+* BREAKING CHANGE: Python 2.6 is no longer supported (because we rely on pytest
+  >= 3.6)
+
+Fixed
+
+* Use the new pytest mark API to fix MarkInfo warnings (`#2`_)
+* BREAKING CHANGE: Symlinks are now copied as links instead of copying the
+  target they point to (`#1`_)
+
 `1.0`_
 ~~~~~~
 
@@ -48,11 +66,16 @@ Added
   function
 
 
-.. _`Unreleased`: https://github.com/omarkohl/pytest-datafiles/compare/1.0...master
+.. _`Unreleased`: https://github.com/omarkohl/pytest-datafiles/compare/2.0...master
+.. _`2.0`: https://github.com/omarkohl/pytest-datafiles/compare/1.0...2.0
 .. _`1.0`: https://github.com/omarkohl/pytest-datafiles/compare/0.2...1.0
 .. _`0.2`: https://github.com/omarkohl/pytest-datafiles/compare/0.1...0.2
 .. _`0.1`: https://github.com/omarkohl/pytest-datafiles/compare/3c31b2c...0.1
 
 
+.. _`#1`: https://github.com/omarkohl/pytest-datafiles/issues/1
+.. _`#2`: https://github.com/omarkohl/pytest-datafiles/issues/2
+
+
 .. _`Semantic Versioning`: http://semver.org/
 .. _`Keep a CHANGELOG`: http://keepachangelog.com/
diff --git a/setup.py b/setup.py
index 565820c..8b618a2 100755
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ def _read(fname):
 
 setup(
     name='pytest-datafiles',
-    version='1.0',
+    version='2.0',
     py_modules=['pytest_datafiles'],
     url='https://github.com/omarkohl/pytest-datafiles',
     license='MIT',