diff --git a/CHANGES.txt b/CHANGES.txt
index 1dd08b7..a397447 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 1.0RC1 (unreleased)
 -------------------
 
+- Make sure plone.app.registry's ZCML is loaded, so that its import step will run
+  when plone.app.discussion is installed.
+  [davisagli]
+
 - Avoid sending multiple notification emails to the same person when
   he has commented multiple times.
   [maurits]
diff --git a/plone/app/discussion/configure.zcml b/plone/app/discussion/configure.zcml
index d18db42..e628131 100644
--- a/plone/app/discussion/configure.zcml
+++ b/plone/app/discussion/configure.zcml
@@ -10,10 +10,11 @@
     <five:registerPackage package="." />
 
     <include package="plone.indexer" />
-
+    <include package="plone.app.registry" />
+	
     <!-- XXX: Excluding plone.app.uuid for Plone 3 is only a temporary 'fix'.
          plone.app.uuid causes the IObjectAddedEvent to be fired twice on
-         Plone 3. This causes the email notifications to be send twice.
+         Plone 3. This causes the email notifications to be sent twice.
 
          This means that https://dev.plone.org/plone/ticket/10652 is fixed only
          for Plone 4.