diff --git a/CHANGES.txt b/CHANGES.txt
index f70fe0b..d4656bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 1.0RC1 (unreleased)
 -------------------
 
+- Move the discussion control panel to the core Plone configuration.
+  [timo]
+
 - Always set the effective date of a comment to the same value as the creation
   date. 
   [timo]
diff --git a/plone/app/discussion/profiles/default/controlpanel.xml b/plone/app/discussion/profiles/default/controlpanel.xml
index 88450b8..5e47af3 100644
--- a/plone/app/discussion/profiles/default/controlpanel.xml
+++ b/plone/app/discussion/profiles/default/controlpanel.xml
@@ -9,7 +9,7 @@
         title="Discussion"
         action_id="discussion"
         appId="plone.app.discussion"
-        category="Products"
+        category="Plone"
         condition_expr=""
         icon_expr="string:${portal_url}/discussionitem_icon.gif"
         url_expr="string:${portal_url}/@@discussion-settings"