diff --git a/AUTHORS b/AUTHORS
index f4a21b22d..76726af2b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -79,6 +79,7 @@ Ross Lawley
 Ryan Wooden
 Samuele Pedroni
 Tom Viner
+Thomas Grainger
 Trevor Bekolay
 Wouter van Ackooy
 David Díaz-Barquero
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2be8c9aae..4783395a8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,12 +3,18 @@
 
 **Bug Fixes**
 
-*
+* Text documents without any doctests no longer appear as "skipped".
+  Thanks `@graingert`_ for reporting and providing a full PR (`#1580`_).
 
 *
 
 *
 
+.. _#1580: https://github.com/pytest-dev/pytest/issues/1580
+
+.. _@graingert: https://github.com/graingert
+
+
 2.9.2
 =====