diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 30503f4..abc0f0d 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -4,6 +4,7 @@ Changelog
 1.0b3 (XXXX-XX-XX)
 ------------------
 
+* Register the event subscribers for the correct interfaces in Plone 3. [hannosch]
 * 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]
diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
index a56fed9..1be80e1 100644
--- a/plone/app/discussion/subscribers.zcml
+++ b/plone/app/discussion/subscribers.zcml
@@ -1,37 +1,76 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone.app.discussion">
 
     <!-- Event subscribers -->
 
-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectAddedEvent"
-        handler=".comment.notify_workflow"
-        />
+    <configure zcml:condition="not-installed zope.app.container">
 
-    <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.IObjectAddedEvent"
+          handler=".comment.notify_workflow"
+          />
 
-    <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=".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=".comment.notify_content_object"
+          />
 
-    <subscriber
-        for="plone.app.discussion.interfaces.IComment
-             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
-        handler=".tool.unindex_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>
+
+    <configure zcml:condition="installed zope.app.container">
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_workflow"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_content_object"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectRemovedEvent"
+          handler=".comment.notify_content_object"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectAddedEvent"
+          handler=".tool.index_object"
+          />
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectRemovedEvent"
+          handler=".tool.unindex_object"
+          />
+
+      </configure>
 
 </configure>