diff --git a/CHANGES b/CHANGES
index f7a5e95faa8aef8ce41d58eeeab2c7f8a775028b..95aec9ce12d28a81aa50bbff299487fd560649ae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,7 @@ OpenLDAP 2.4.21 Engineering
 	Documentation
 		slapd-meta(5) Note deprecated functions (ITS#6424)
 		admin24 fix set example for group of groups (ITS#6382)
+		admin24 fix dynamic group documentation (ITS#6290)
 
 OpenLDAP 2.4.20 Release (2009/11/27)
 	Fixed client tools with LDAP options (ITS#6283)
diff --git a/doc/guide/admin/allusersgroup-en.png b/doc/guide/admin/allusersgroup-en.png
index e8e2b17573bddea84cdc07cb3485c5ef620e50c8..76f1569ae76f7e26377dfb82194587ebf2195033 100644
Binary files a/doc/guide/admin/allusersgroup-en.png and b/doc/guide/admin/allusersgroup-en.png differ
diff --git a/doc/guide/admin/overlays.sdf b/doc/guide/admin/overlays.sdf
index 049b9e51ea19c758ea47bf7d1792dbd43451e464..104582af35c67d379cb1d9c7ca5e146b1391d5e8 100644
--- a/doc/guide/admin/overlays.sdf
+++ b/doc/guide/admin/overlays.sdf
@@ -551,18 +551,23 @@ directory.
 
 In {{F:slapd.conf}}(5):
 
+>       include /path/to/dyngroup.schema
+>       ...
 >       overlay dynlist
->       dynlist-attrset groupOfNames labeledURI member
+>       dynlist-attrset groupOfURLs labeledURI member
++
++Note: We must include the {{F:dyngroup.schema}} file that defines the
++{{F:groupOfURLs}} objectClass used in this example.
 
 Let's apply it to the following entry:
 
 >       cn=allusers,ou=group,dc=example,dc=com
 >       cn: all
->       objectClass: groupOfNames
+>       objectClass: groupOfURLs
 >       labeledURI: ldap:///ou=people,dc=example,dc=com??one?(objectClass=inetOrgPerson)
 
 The behavior is similar to the dynamic list configuration we had before:
-whenever an entry with the {{F:groupOfNames}} object class is retrieved, the
+whenever an entry with the {{F:groupOfURLs}} object class is retrieved, the
 search specified in the {{F:labeledURI}} attribute is performed. But this time,
 only the distinguished names of the results are added, and as values of the
 {{F:member}} attribute.
diff --git a/doc/guide/images/src/allusersgroup-en.svg b/doc/guide/images/src/allusersgroup-en.svg
index 75b8ee073749e511ad980b501f19c1a68c8ee1f8..a50ee90b83c688908a4d9cce77bb841c5fdc3175 100644
--- a/doc/guide/images/src/allusersgroup-en.svg
+++ b/doc/guide/images/src/allusersgroup-en.svg
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
@@ -12,16 +13,22 @@
    height="107.84196"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
+   inkscape:version="0.46+devel"
    version="1.0"
-   sodipodi:docbase="/home/andreas/palestra"
    sodipodi:docname="allusersgroup-en.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/palestra/ppolicy.png"
-   inkscape:export-xdpi="136.2"
-   inkscape:export-ydpi="136.2">
+   inkscape:export-filename="/anything/src/openldap/ldap/doc/guide/admin/allusersgroup-en.png"
+   inkscape:export-xdpi="107.65753"
+   inkscape:export-ydpi="107.65753">
   <defs
      id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 53.920979 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="419.4133 : 53.920979 : 1"
+       inkscape:persp3d-origin="209.70665 : 35.947319 : 1"
+       id="perspective30" />
     <marker
        inkscape:stockid="Arrow2Lstart"
        orient="auto"
@@ -63,11 +70,12 @@
      inkscape:current-layer="layer1"
      showgrid="true"
      showguides="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="953"
+     inkscape:window-width="1274"
+     inkscape:window-height="950"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:guide-bbox="true" />
+     inkscape:window-y="25"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -76,6 +84,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -106,7 +115,7 @@
          y="78.033184"
          id="tspan5379">objectClass: <tspan
    style="font-weight:bold"
-   id="tspan5396">groupOfNames</tspan></tspan><tspan
+   id="tspan5396">groupOfURLs</tspan></tspan><tspan
          sodipodi:role="line"
          x="116.88309"
          y="92.036435"