diff --git a/lam/HISTORY b/lam/HISTORY
index b8c33177..c4558951 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -5,6 +5,7 @@ September 2019 6.9
    -> user name attribute for privacyIDEA can be specified
   - LAM Pro:
    -> New self service settings for login and main page footer
+   -> Custom fields: custom labels for LDAP search select list
   - Fixed bugs:
    -> Configuration issue with Unix user/host module (206)
 
diff --git a/lam/docs/manual-sources/chapter-modules.xml b/lam/docs/manual-sources/chapter-modules.xml
index fa085a4c..502f034f 100644
--- a/lam/docs/manual-sources/chapter-modules.xml
+++ b/lam/docs/manual-sources/chapter-modules.xml
@@ -5479,6 +5479,10 @@ OK (10 msec)</programlisting>
     <para>Attribute name: The values of this attribute will be used to build
     the selection list.</para>
 
+    <para>Display attributes: List of attributes to show as label for the
+    options in select box. Attribute wildcards are surrounded by "$", e.g.
+    "$cn$" will be replaced by "cn" attribute. Default is "$dn$".</para>
+
     <para>Presentation:</para>
 
     <screenshot>
diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml
index 43b43b69..bc5e1126 100644
--- a/lam/docs/manual-sources/chapter-selfService.xml
+++ b/lam/docs/manual-sources/chapter-selfService.xml
@@ -1795,6 +1795,10 @@
       <para>Attribute name: The values of this attribute will be used to build
       the selection list.</para>
 
+      <para>Display attributes: List of attributes to show as label for the
+      options in select box. Attribute wildcards are surrounded by "$", e.g.
+      "$cn$" will be replaced by "cn" attribute. Default is "$dn$".</para>
+
       <para>Presentation:</para>
 
       <screenshot>
diff --git a/lam/docs/manual-sources/images/customFields26.png b/lam/docs/manual-sources/images/customFields26.png
index 547eced1..ae91acf8 100644
Binary files a/lam/docs/manual-sources/images/customFields26.png and b/lam/docs/manual-sources/images/customFields26.png differ