diff --git a/lam/HISTORY b/lam/HISTORY
index b0299b16..862ddaa0 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -1,5 +1,7 @@
 June 2016 5.4
   - Unix: support magic numbers for UIDs/GIDs (e.g. 389 server DNA plugin)
+  - LAM Pro:
+   -> Self registration: support for Google reCAPTCHA
 
 
 21.03.2016 5.3
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 337e2b00..aa295684 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -8699,6 +8699,30 @@ OK (10 msec)</programlisting>
         account registration. The user may log in to self service when his
         account was created to manage all his attributes.</para>
 
+        <literallayout>
+</literallayout>
+
+        <para><emphasis role="bold">Captcha support</emphasis></para>
+
+        <para>LAM Pro can optionally display a captcha to verify that
+        registrations are not from robots. The supported captcha provider is
+        Google reCAPTCHA. You will need the site and secret key for your
+        domain. They can be retrieved from here: <ulink
+        url="https://www.google.com/recaptcha">https://www.google.com/recaptcha</ulink></para>
+
+        <para>Please note that your web server must be able to access
+        "https://www.google.com/recaptcha/api/siteverify" to verify the
+        captchas. Captchas will be displayed automatically when site+secret
+        key are filled.</para>
+
+        <screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/accountRegistration4.png" />
+            </imageobject>
+          </mediaobject>
+        </screenshot>
+
         <literallayout>
 </literallayout>
 
diff --git a/lam/docs/manual-sources/images/accountRegistration4.png b/lam/docs/manual-sources/images/accountRegistration4.png
new file mode 100644
index 00000000..ff935562
Binary files /dev/null and b/lam/docs/manual-sources/images/accountRegistration4.png differ