diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 2c8accc..30503f4 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,6 +4,7 @@ Changelog
 1.0b3 (XXXX-XX-XX)
 ------------------
 
+* Factored out subscriber declarations into its own ZCML file. [hannosch]
 * Bugfix for #2281226: Moderation View: Comments disappear when hitting the 'Apply' button without choosing a bulk action. [timo]
 * Allow to show the full text of a comment in the moderation view. [timo]
 * German translation added. [timo]
diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index f66a27a..f6d6b5d 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -8,6 +8,7 @@
     <include package="plone.indexer" />
 
     <include file="permissions.zcml" />
+    <include file="subscribers.zcml" />
     <include package=".browser" />
 
     <i18n:registerTranslations directory="locales" />
@@ -57,38 +58,6 @@
     <adapter factory=".conversation.ConversationReplies" />
     <adapter factory=".conversation.CommentReplies" />
 
-    <!-- Event subscribers -->
-
-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectAddedEvent"
-        handler=".comment.notify_workflow"
-        />
-
-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectAddedEvent"
-        handler=".comment.notify_content_object"
-        />
-
-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
-        handler=".comment.notify_content_object"
-        />
-
-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectAddedEvent"
-        handler=".tool.index_object"
-        />
-
-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
-        handler=".tool.unindex_object"
-        />
-
     <!-- Captcha Vocabulary -->
     <utility component=".vocabularies.captcha_vocabulary"
            name="plone.app.discussion.vocabularies.CaptchaVocabulary" />
diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
new file mode 100644
index 0000000..a56fed9
--- /dev/null
+++ b/plone/app/discussion/subscribers.zcml
@@ -0,0 +1,37 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    i18n_domain="plone.app.discussion">
+
+    <!-- Event subscribers -->
+
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.lifecycleevent.interfaces.IObjectAddedEvent"
+        handler=".comment.notify_workflow"
+        />
+
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.lifecycleevent.interfaces.IObjectAddedEvent"
+        handler=".comment.notify_content_object"
+        />
+
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
+        handler=".comment.notify_content_object"
+        />
+
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.lifecycleevent.interfaces.IObjectAddedEvent"
+        handler=".tool.index_object"
+        />
+
+    <subscriber
+        for="plone.app.discussion.interfaces.IComment
+             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
+        handler=".tool.unindex_object"
+        />
+
+</configure>