diff --git a/AUTHORS b/AUTHORS
index 0c40517ce..4ef9b9201 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Christopher Gilling
 Daniel Grana
 Daniel Hahler
 Daniel Nuri
+Danielle Jenkins
 Dave Hunt
 David Mohr
 David Vierra
@@ -84,9 +85,11 @@ Ronny Pfannschmidt
 Ross Lawley
 Ryan Wooden
 Samuele Pedroni
+Steffen Allner
 Tareq Alayan
 Tom Viner
 Trevor Bekolay
+Vasily Kuznetsov
 Wouter van Ackooy
 David Díaz-Barquero
 Eric Hunsberger
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 26f78cec1..ecb9e682d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -43,6 +43,13 @@
   Can also show where fixtures are defined if combined with ``-v``.
   Thanks `@hackebrot`_ for the PR.
 
+* New cli flags:
+  ``--setup-plan`` performs normal collection and reports the potential setup
+    and teardown, does not execute any fixtures and tests
+  ``--setup-only`` performs normal collection, executes setup and teardown of
+    fixtures and reports them. Thanks `@d6e`_, `@kvas-it`_, `@sallner`_
+    and `@omarkohl`_.
+
 **Changes**
 
 * Fixtures marked with ``@pytest.fixture`` can now use ``yield`` statements exactly like