diff --git a/AUTHORS.rst b/AUTHORS.rst
index ee00aa9..81590be 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -3,33 +3,67 @@ Main authors (commit rights to the main repository)
 
 * Chris Glass
 * Diederik van der Boor
+* Charlie Denton
+* Jerome Leclanche
 
 
 Contributors
 =============
 
 * Abel Daniel
+* Adam Chainz
 * Adam Wentz
 * Andrew Ingram (contributed setup.py)
+* Al Johri
+* Alex Alvarez
+* Andrew Dodd
+* Angel Velasquez
+* Austin Matsick
 * Ben Konrath
+* Bert Constantin
 * Bertrand Bordage
 * Chad Shryock
 * Charles Leifer (python 2.4 compatibility)
+* Chris Barna
+* Chris Brantley
+* Christopher Glass
 * David Sanders
+* Éric Araujo
 * Evan Borgstrom
+* Frankie Dintino
 * Gavin Wahl
 * Germán M. Bravo
+* Gonzalo Bustos
+* Gregory Avery-Weir
 * Hugo Osvaldo Barrera
 * Jacob Rief
+* James Murty
 * Jedediah Smith (proxy models support)
-* Jerome Leclanche
 * John Furr
+* Jonas Haag
 * Jonas Obrist
 * Julian Wachholz
+* Kamil Bar
+* Kelsey Gilmore-Innis
 * Kevin Armenat
+* Krzysztof Gromadzki
+* Krzysztof Nazarewski
+* Luis Zárate
 * Marius Lueck
 * Martin Brochhaus
+* Martin Maillard
+* Michael Fladischer
+* Nick Ward
+* Oleg Myltsyn
+* Omer Strumpf
+* Paweł Adamczak
+* Petr Dlouhý
+* Sander van Leeuwen
+* Sobolev Nikita
+* Tadas Dailyda
+* Tai Lee
 * Tomas Peterka
+* Tony Narlock
 * Vail Gold
 
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index f843587..8a35cae 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,19 @@
 Changelog
 =========
 
+Changes in 2.0.1 (2018-02-05)
+-----------------------------
+
+* Fixed manager inheritance detection for Django 1.11.
+
+  It's recommended to use ``Meta.manager_inheritance_from_future`` so Django 1.x code also inherits
+  the ``PolymorphicManager`` in all subclasses. Django 2.0 already does this by default.
+  This restores the manager inheritance behavior that *django-polymorphic 1.3* enforced for Django 1.x projects.
+
+* Deprecated the ``base_objects`` manager. Use ``objects.non_polymorphic()`` instead.
+* Fixed test management commands
+
+
 Changes in 2.0 (2018-01-22)
 ---------------------------
 
diff --git a/docs/conf.py b/docs/conf.py
index 20da1fb..eb23ed9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -61,9 +61,9 @@ copyright = u'2013, Bert Constantin, Chris Glass, Diederik van der Boor'
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.0.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = '2.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
index bd42255..2a39f42 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = django-polymorphic
-version = 2.0
+version = 2.0.1
 description = Seamless polymorphic inheritance for Django models
 long_description = file:README.rst
 author = Bert Constantin