diff --git a/lam/HISTORY b/lam/HISTORY
index 3ed43879..039e8df4 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -5,6 +5,7 @@ June 2017
   - Windows: Support unlocking of users with too many failed login attempts
   - LAM Pro:
    -> Custom fields: can be used for file upload
+   -> Custom fields: new selection list type that gets options from LDAP search
    -> Kopano support
 
 
diff --git a/lam/docs/manual-sources/chapter-modules.xml b/lam/docs/manual-sources/chapter-modules.xml
index 4315b061..fa958423 100644
--- a/lam/docs/manual-sources/chapter-modules.xml
+++ b/lam/docs/manual-sources/chapter-modules.xml
@@ -5026,6 +5026,39 @@ OK (10 msec)</programlisting>
       </mediaobject>
     </screenshot>
 
+    <para><emphasis role="bold">LDAP search select list</emphasis></para>
+
+    <para>This is similar to "Select list" but the option are read from LDAP.
+    You can use this to define e.g. a DN selection list. Multiple values are
+    supported.</para>
+
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/customFields26.png" />
+        </imageobject>
+      </mediaobject>
+    </screenshot>
+
+    <para>LDAP suffix: The LDAP DN that is used as starting point to search
+    for LDAP entries.</para>
+
+    <para>LDAP filter: Only LDAP entries that match this filter will be used.
+    If all entries should be used then use "(objectclass=*)".</para>
+
+    <para>Attribute name: The values of this attribute will be used to build
+    the selection list.</para>
+
+    <para>Presentation:</para>
+
+    <screenshot>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/customFields27.png" />
+        </imageobject>
+      </mediaobject>
+    </screenshot>
+
     <para id="customFields_validation_expressions_admin"><emphasis
     role="bold">Validation expressions:</emphasis></para>
 
diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml
index 1db39f42..ed08f35c 100644
--- a/lam/docs/manual-sources/chapter-selfService.xml
+++ b/lam/docs/manual-sources/chapter-selfService.xml
@@ -1262,7 +1262,7 @@
     </section>
 
     <section>
-      <title>Custom fields (LAM Pro)</title>
+      <title>Custom fields</title>
 
       <para>This module allows you to manage LDAP attributes that are not
       covered by the other LAM modules (e.g. if you use custom LDAP schemas).
@@ -1516,6 +1516,39 @@
         </mediaobject>
       </screenshot>
 
+      <para>LDAP search select list</para>
+
+      <para>This is similar to "Select list" but the option are read from
+      LDAP. You can use this to define e.g. a DN selection list. Multiple
+      values are supported.</para>
+
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/customFields26.png" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+
+      <para>LDAP suffix: The LDAP DN that is used as starting point to search
+      for LDAP entries.</para>
+
+      <para>LDAP filter: Only LDAP entries that match this filter will be
+      used. If all entries should be used then use "(objectclass=*)".</para>
+
+      <para>Attribute name: The values of this attribute will be used to build
+      the selection list.</para>
+
+      <para>Presentation:</para>
+
+      <screenshot>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/customFields27.png" />
+          </imageobject>
+        </mediaobject>
+      </screenshot>
+
       <para id="customFields_validation_expressions"><emphasis
       role="bold">Validation expressions:</emphasis></para>
 
diff --git a/lam/docs/manual-sources/images/customFields26.png b/lam/docs/manual-sources/images/customFields26.png
new file mode 100644
index 00000000..13e55a00
Binary files /dev/null and b/lam/docs/manual-sources/images/customFields26.png differ
diff --git a/lam/docs/manual-sources/images/customFields27.png b/lam/docs/manual-sources/images/customFields27.png
new file mode 100644
index 00000000..8bcc8d06
Binary files /dev/null and b/lam/docs/manual-sources/images/customFields27.png differ