diff --git a/docsite/rst/faq.rst b/docsite/rst/faq.rst
index 727f4fb1501..2bf2b96ec50 100644
--- a/docsite/rst/faq.rst
+++ b/docsite/rst/faq.rst
@@ -15,6 +15,7 @@ Setting environment variables can be done with the `environment` keyword. It can
       PATH: "{{ ansible_env.PATH }}:/thingy/bin"
       SOME: value
 
+.. note:: starting in 2.0.1 the setup task from gather_facts also inherits the environment directive from the play, you might need to use the `|default` filter to avoid errors if setting this at play level.
 
 
 How do I handle different machines needing different user accounts or ports to log in with?