diff --git a/CHANGES.rst b/CHANGES.rst
index 0a8f3fd..be4873e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -15,6 +15,9 @@ New features:
 
 Bug fixes:
 
+- Fix location of controlpanel events.
+  [jensens]
+
 - Fixed tests when IRichText behavior is used.
   IRichText -> IRichTextBehavior
   This is a follow up to `issue 476 <https://github.com/plone/plone.app.contenttypes/issues/476>`_.
diff --git a/plone/app/discussion/browser/controlpanel.py b/plone/app/discussion/browser/controlpanel.py
index 3c88ebe..5e904d8 100644
--- a/plone/app/discussion/browser/controlpanel.py
+++ b/plone/app/discussion/browser/controlpanel.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from plone.app.controlpanel.interfaces import IConfigurationChangedEvent
 from plone.app.discussion.interfaces import _
 from plone.app.discussion.interfaces import IDiscussionSettings
 from plone.app.discussion.upgrades import update_registry
@@ -7,6 +6,7 @@ from plone.app.registry.browser import controlpanel
 from plone.registry.interfaces import IRecordModifiedEvent
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
+from Products.CMFPlone.interfaces.controlpanel import IConfigurationChangedEvent  # noqa: E501
 from Products.CMFPlone.interfaces.controlpanel import IMailSchema
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.statusmessages.interfaces import IStatusMessage
diff --git a/plone/app/discussion/subscribers.zcml b/plone/app/discussion/subscribers.zcml
index 5bb3535..20e1b7f 100644
--- a/plone/app/discussion/subscribers.zcml
+++ b/plone/app/discussion/subscribers.zcml
@@ -66,7 +66,7 @@
     <!-- Control panel event subscribers -->
 
     <subscriber
-        for="plone.app.controlpanel.interfaces.IConfigurationChangedEvent"
+        for="Products.CMFPlone.interfaces.events.IConfigurationChangedEvent"
         handler=".browser.controlpanel.notify_configuration_changed"
         />