diff --git a/lam/HISTORY b/lam/HISTORY
index cb1bc6f3..237cfefd 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -5,7 +5,7 @@ December 2013 4.4
   - LAM Pro:
    -> Bind DLZ support
    -> Samba/Shadow: display password change date in self service
-   -> Custom fields: support custom label and icon
+   -> Custom fields: support custom label and icon, auto-completion
 
 
 25.09.2013 4.3
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 9d714feb..8dafff50 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -4620,6 +4620,11 @@ Run slapindex to rebuild the index.
       linkend="customFields_validation_expressions_admin">validation
       expression</link> and error message.</para>
 
+      <para>You can also enable auto-completion. In this case LAM will search
+      all accounts for the given attribute and provide auto-completion hints
+      when the user edits this field. This should only be used if there is a
+      limited number of different values for this attribute.</para>
+
       <screenshot>
         <mediaobject>
           <imageobject>
@@ -6632,6 +6637,12 @@ Run slapindex to rebuild the index.
           linkend="customFields_validation_expressions">validation
           expression</link> and error message.</para>
 
+          <para>You can also enable auto-completion. In this case LAM will
+          search all accounts for the given attribute and provide
+          auto-completion hints when the user edits this field. This should
+          only be used if there is a limited number of different values for
+          this attribute.</para>
+
           <screenshot>
             <mediaobject>
               <imageobject>
diff --git a/lam/docs/manual-sources/images/customFields2.png b/lam/docs/manual-sources/images/customFields2.png
index 4af113d0..6fdc1754 100644
Binary files a/lam/docs/manual-sources/images/customFields2.png and b/lam/docs/manual-sources/images/customFields2.png differ