diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 4fab0a2..eb4c1b5 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,6 +4,7 @@ Changelog
 1.0b3 (XXXX-XX-XX)
 ------------------
 
+* Automatically load the ZCML files of the captcha widgets if they are installed. [hannosch]
 * Fixed i18n domain in GenericSetup profiles to be ``plone``. Other values aren't supported for GS profiles. [hannosch]
 * Provide our own copy of the default one state workflow. Not all Plone sites have this workflow installed. [hannosch]
 * Register the event subscribers for the correct interfaces in Plone 3. [hannosch]
diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index f6d6b5d..7277585 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -3,6 +3,7 @@
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:monkey="http://namespaces.plone.org/monkey"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.discussion">
 
     <include package="plone.indexer" />
@@ -62,6 +63,14 @@
     <utility component=".vocabularies.captcha_vocabulary"
            name="plone.app.discussion.vocabularies.CaptchaVocabulary" />
 
+    <configure zcml:condition="installed plone.formwidget.captcha">
+      <include package="plone.formwidget.captcha" />
+    </configure>
+
+    <configure zcml:condition="installed plone.formwidget.recaptcha">
+      <include package="plone.formwidget.recaptcha" />
+    </configure>
+
     <!-- Conversation indexes -->
     <adapter name="total_comments" factory=".catalog.total_comments" />
     <adapter name="last_comment_date" factory=".catalog.last_comment_date" />