diff --git a/lam/HISTORY b/lam/HISTORY
index 587c5c65..1bb05654 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,3 +1,8 @@
+March 2018 6.3
+  - LAM Pro:
+   -> Support dynamic lists
+
+
 13.12.2017 6.2
   - License changed from GPL v2 to GPL v3
   - PHP 5.6 and Internet Explorer 11 or later required
diff --git a/lam/docs/manual-sources/chapter-modules.xml b/lam/docs/manual-sources/chapter-modules.xml
index 3cbb890d..1042b0af 100644
--- a/lam/docs/manual-sources/chapter-modules.xml
+++ b/lam/docs/manual-sources/chapter-modules.xml
@@ -2519,6 +2519,82 @@
       </screenshot>
     </section>
 
+    <section>
+      <title>Dynamic lists (LAM Pro)</title>
+
+      <para><ulink
+      url="http://www.openldap.org/doc/admin24/overlays.html#Dynamic%20Lists">Dynamic
+      lists</ulink> allow you to create LDAP entries that populate the value
+      of an attribute via LDAP query. This is e.g. used to create groups that
+      contain all users in a certain DN.</para>
+
+      <para>Please note that this functionality requires configuration on your
+      LDAP server. E.g. on OpenLDAP you need to activate the "dynlist" overlay
+      and need to specify attribute mappings.</para>
+
+      <para><emphasis role="bold">Configuration</emphasis></para>
+
+      <para>Add a new group account type and set a unique label for it.</para>
+
+      <para><inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/mod_dynamicList1.png"/>
+          </imageobject>
+        </inlinemediaobject></para>
+
+      <para>Do not forget to set proper "List attributes" to be shown on the
+      overview page of all dynamic lists.</para>
+
+      <para><inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/mod_dynamicList2.png"/>
+          </imageobject>
+        </inlinemediaobject></para>
+
+      <para>On tab "Modules" please add the dynamic lists module.</para>
+
+      <para><inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/mod_dynamicList4.png"/>
+          </imageobject>
+        </inlinemediaobject></para>
+
+      <para>On tab "Module settings" you can now configure your dynamic lists.
+      Here you setup the used object class, RDN attribute, query attribute and
+      list attribute (the one that is populated via query).</para>
+
+      <para>In case you have different types of dynamic lists you can simply
+      redo the steps above to create more group types.</para>
+
+      <para><inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/mod_dynamicList3.png"/>
+          </imageobject>
+        </inlinemediaobject></para>
+
+      <para/>
+
+      <para><emphasis role="bold">Usage</emphasis></para>
+
+      <para>When you login to LAM you will see your new dynamic lists
+      tab.</para>
+
+      <para><inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/mod_dynamicList5.png"/>
+          </imageobject>
+        </inlinemediaobject></para>
+
+      <para>For each list you can manage the name and query string. LAM also
+      displays which entries are auto-populated to the list.</para>
+
+      <para><inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/mod_dynamicList6.png"/>
+          </imageobject>
+        </inlinemediaobject></para>
+    </section>
+
     <section>
       <title>PyKota</title>
 
diff --git a/lam/docs/manual-sources/images/mod_dynamicList1.png b/lam/docs/manual-sources/images/mod_dynamicList1.png
new file mode 100644
index 00000000..92109d36
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_dynamicList1.png differ
diff --git a/lam/docs/manual-sources/images/mod_dynamicList2.png b/lam/docs/manual-sources/images/mod_dynamicList2.png
new file mode 100644
index 00000000..55b457ed
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_dynamicList2.png differ
diff --git a/lam/docs/manual-sources/images/mod_dynamicList3.png b/lam/docs/manual-sources/images/mod_dynamicList3.png
new file mode 100644
index 00000000..1b5a249e
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_dynamicList3.png differ
diff --git a/lam/docs/manual-sources/images/mod_dynamicList4.png b/lam/docs/manual-sources/images/mod_dynamicList4.png
new file mode 100644
index 00000000..f4da246d
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_dynamicList4.png differ
diff --git a/lam/docs/manual-sources/images/mod_dynamicList5.png b/lam/docs/manual-sources/images/mod_dynamicList5.png
new file mode 100644
index 00000000..080dfb45
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_dynamicList5.png differ
diff --git a/lam/docs/manual-sources/images/mod_dynamicList6.png b/lam/docs/manual-sources/images/mod_dynamicList6.png
new file mode 100644
index 00000000..0a90f565
Binary files /dev/null and b/lam/docs/manual-sources/images/mod_dynamicList6.png differ
diff --git a/lam/graphics/find.png b/lam/graphics/find.png
index a3e5175b..fdfa51f7 100644
Binary files a/lam/graphics/find.png and b/lam/graphics/find.png differ
diff --git a/lam/lib/types/group.inc b/lam/lib/types/group.inc
index b98ef39c..2997e036 100644
--- a/lam/lib/types/group.inc
+++ b/lam/lib/types/group.inc
@@ -113,6 +113,7 @@ class group extends baseType {
 			"memberuid" => _("Group members"),
 			"roleOccupant" => _("Role member DNs"),
 			"uniqueMember" => _("Group member DNs"),
+			"memberUrl" => _("Entries"),
 		);
 		if ($this->getType() != null) {
 			$modules = $this->getType()->getModules();