diff --git a/AUTHORS b/AUTHORS
index c2400f508..d1a4aa675 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -141,5 +141,6 @@ Trevor Bekolay
 Tyler Goodlet
 Vasily Kuznetsov
 Victor Uriarte
+Vidar T. Fauske
 Wouter van Ackooy
 Xuecong Liao
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 612ee0f3b..b81803324 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,7 +6,8 @@
 * Replace ``raise StopIteration`` usages in the code by simple ``returns`` to finish generators, in accordance to `PEP-479`_ (`#2160`_).
   Thanks `@tgoodlet`_ for the report and `@nicoddemus`_ for the PR.
 
-*
+* Skipping plugin now also works with test items generated by custom collectors (`#2231`_).
+  Thanks to `@vidartf`_.
 
 *
 
@@ -16,6 +17,10 @@
 
 .. _PEP-479: https://www.python.org/dev/peps/pep-0479/
 
+.. _#2231: https://github.com/pytest-dev/pytest/issues/2231
+
+.. _@vidartf: https://github.com/vidartf
+
 
 3.0.6 (2017-01-22)
 ==================