diff --git a/CHANGES.txt b/CHANGES.txt
index a70a227..b6ecdeb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 1.0b7 (unreleased)
 ------------------
 
+* Put email notification subscribers into their own zcml file so it is easier
+  for integrators to override them.
+  [timo]
+  
 * Plain text and intelligent text options for comment text added to preserve 
   basic text structure and to make links clickable.
   [timo]
diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index 0ea1f1d..e7b9d2f 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -12,6 +12,7 @@
     <include package="plone.indexer" />
 
     <include file="permissions.zcml" />
+    <include file="notifications.zcml" />
     <include file="subscribers.zcml" />
     <include package=".browser" />
 
diff --git a/plone/app/discussion/notifications.zcml b/plone/app/discussion/notifications.zcml
new file mode 100644
index 0000000..e72aee0
--- /dev/null
+++ b/plone/app/discussion/notifications.zcml
@@ -0,0 +1,47 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    i18n_domain="plone.app.discussion">
+
+    <!-- Plone 3 Event Subscribers -->
+
+    <configure zcml:condition="not-installed zope.app.container">
+
+      <!--
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.lifecycleevent.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_user"
+          />
+      -->
+      
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.lifecycleevent.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_moderator"
+          />
+          
+    </configure>
+
+    
+    <!-- Plone 4 Event Subscribers -->
+    
+    <configure zcml:condition="installed zope.app.container">
+
+      <!--
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_user"
+          />
+      -->
+
+      <subscriber
+          for="plone.app.discussion.interfaces.IComment
+               zope.app.container.interfaces.IObjectAddedEvent"
+          handler=".comment.notify_moderator"
+          />
+
+    </configure>
+
+</configure>
diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
index 6e0cb1f..0323996 100644
--- a/plone/app/discussion/subscribers.zcml
+++ b/plone/app/discussion/subscribers.zcml
@@ -36,20 +36,6 @@
                zope.lifecycleevent.interfaces.IObjectRemovedEvent"
           handler=".tool.unindex_object"
           />
-      
-      <!--
-      <subscriber
-          for="plone.app.discussion.interfaces.IComment
-               zope.lifecycleevent.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_user"
-          />
-	  -->
-	  
-      <subscriber
-          for="plone.app.discussion.interfaces.IComment
-               zope.lifecycleevent.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_moderator"
-          />
 
       <subscriber
           for="Products.CMFCore.interfaces.IContentish
@@ -94,20 +80,6 @@
           handler=".tool.unindex_object"
           />
 
-	  <!--
-      <subscriber
-          for="plone.app.discussion.interfaces.IComment
-               zope.app.container.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_user"
-          />
-      -->
-
-      <subscriber
-          for="plone.app.discussion.interfaces.IComment
-               zope.app.container.interfaces.IObjectAddedEvent"
-          handler=".comment.notify_moderator"
-          />
-
       <subscriber
           for="Products.CMFCore.interfaces.IContentish
                zope.app.container.interfaces.IObjectRemovedEvent"