diff --git a/AUTHORS b/AUTHORS
index ce19f1f21..063593dd6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ Contributors include::
 Abdeali JK
 Abhijeet Kasurde
 Ahn Ki-Wook
+Alexander Johnson
 Alexei Kozlenok
 Anatoly Bubenkoff
 Andreas Zeidler
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index beb0542be..7aceb200c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -15,6 +15,9 @@
 3.0.7 (2017-03-14)
 ==================
 
+* Change capture.py's DontReadFromInput class to throw io.UnsupportedOperation errors rather
+  than ValueErrors in the fileno method (`#2276`).
+  Thanks `@metasyn` for the PR.
 
 * Fix issue in assertion rewriting breaking due to modules silently discarding
   other modules when importing fails
@@ -58,6 +61,7 @@
 .. _@kkoukiou: https://github.com/KKoukiou
 .. _@omerhadari: https://github.com/omerhadari
 .. _@fbjorn: https://github.com/fbjorn
+.. _@metasyn: https://github.com/metasyn
 
 .. _#2248: https://github.com/pytest-dev/pytest/issues/2248
 .. _#2137: https://github.com/pytest-dev/pytest/issues/2137
@@ -66,6 +70,7 @@
 .. _#2234: https://github.com/pytest-dev/pytest/issues/2234
 .. _#2238: https://github.com/pytest-dev/pytest/issues/2238
 .. _#2281: https://github.com/pytest-dev/pytest/issues/2281
+.. _#2276: https://github.com/pytest-dev/pytest/issues/2276
 
 .. _PEP-479: https://www.python.org/dev/peps/pep-0479/