diff --git a/CHANGES.txt b/CHANGES.txt
index 6eb4f3c..60c1dd9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Changelog
 2.1.6 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- No longer depend on zope.app packages.
+  [hannosch]
 
 
 2.1.5 (2012-04-05)
diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py
index 67e5c14..c330656 100644
--- a/plone/app/discussion/browser/controlpanel.py
+++ b/plone/app/discussion/browser/controlpanel.py
@@ -17,8 +17,7 @@ from plone.app.registry.browser import controlpanel
 from plone.registry.interfaces import IRegistry
 from plone.registry.interfaces import IRecordModifiedEvent
 
-from zope.app.component.hooks import getSite
-
+from zope.component.hooks import getSite
 from zope.component import getMultiAdapter, queryUtility
 
 from z3c.form import button
diff --git a/plone/app/discussion/notifications.zcml b/plone/app/discussion/notifications.zcml
index 754004b..253cea5 100644
--- a/plone/app/discussion/notifications.zcml
+++ b/plone/app/discussion/notifications.zcml
@@ -5,13 +5,13 @@
 
   <subscriber
       for="plone.app.discussion.interfaces.IComment
-           zope.app.container.interfaces.IObjectAddedEvent"
+           zope.lifecycleevent.interfaces.IObjectAddedEvent"
       handler=".comment.notify_user"
       />
 
   <subscriber
       for="plone.app.discussion.interfaces.IComment
-           zope.app.container.interfaces.IObjectAddedEvent"
+           zope.lifecycleevent.interfaces.IObjectAddedEvent"
       handler=".comment.notify_moderator"
       />
 
diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
index 6e5e89c..d0d848d 100644
--- a/plone/app/discussion/subscribers.zcml
+++ b/plone/app/discussion/subscribers.zcml
@@ -5,43 +5,43 @@
 
     <subscriber
         for="plone.app.discussion.interfaces.IComment
-             zope.app.container.interfaces.IObjectAddedEvent"
+             zope.lifecycleevent.interfaces.IObjectAddedEvent"
         handler=".comment.notify_workflow"
         />
 
     <subscriber
         for="plone.app.discussion.interfaces.IComment
-             zope.app.container.interfaces.IObjectAddedEvent"
+             zope.lifecycleevent.interfaces.IObjectAddedEvent"
         handler=".comment.notify_content_object"
         />
 
     <subscriber
         for="plone.app.discussion.interfaces.IComment
-             zope.app.container.interfaces.IObjectRemovedEvent"
+             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
         handler=".comment.notify_content_object"
         />
 
     <subscriber
         for="plone.app.discussion.interfaces.IComment
-             zope.app.container.interfaces.IObjectAddedEvent"
+             zope.lifecycleevent.interfaces.IObjectAddedEvent"
         handler=".tool.index_object"
         />
 
     <subscriber
         for="plone.app.discussion.interfaces.IComment
-             zope.app.container.interfaces.IObjectRemovedEvent"
+             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
         handler=".tool.unindex_object"
         />
 
     <subscriber
         for="Products.CMFCore.interfaces.IContentish
-             zope.app.container.interfaces.IObjectRemovedEvent"
+             zope.lifecycleevent.interfaces.IObjectRemovedEvent"
         handler=".comment.notify_content_object_deleted"
         />
 
     <subscriber
         for="Products.CMFCore.interfaces.IContentish
-             zope.app.container.interfaces.IObjectMovedEvent"
+             zope.lifecycleevent.interfaces.IObjectMovedEvent"
         handler=".comment.notify_content_object_moved"
         />