diff --git a/doc/source/federation/shibboleth.rst b/doc/source/federation/shibboleth.rst
index 2462a6f3ff..b82bd7036a 100644
--- a/doc/source/federation/shibboleth.rst
+++ b/doc/source/federation/shibboleth.rst
@@ -48,10 +48,13 @@ a *<Location>* directive for each identity provider::
         ShibRequestSetting requireSession 1
         ShibRequestSetting applicationId idp_1
         AuthType shibboleth
-        ShibRequireAll On
-        ShibRequireSession On
         ShibExportAssertion Off
         Require valid-user
+
+        <IfVersion < 2.4>
+            ShibRequireSession On
+            ShibRequireAll On
+       </IfVersion>
     </Location>
 
 .. NOTE::
@@ -61,7 +64,7 @@ a *<Location>* directive for each identity provider::
       The same name is used inside the shibboleth2.xml configuration file but they could
       be different.
     * The ``ShibRequireSession`` and ``ShibRequireAll`` rules are invalid in
-      Apache 2.4+ and should be dropped in that specific setup.
+      Apache 2.4+.
     * You are advised to carefully examine `Shibboleth Apache configuration
       documentation
       <https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig>`_