diff --git a/CHANGES.txt b/CHANGES.txt
index d78b8f4..b926068 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
1.0RC1 (unreleased)
-------------------
+- Show "moderate comments" link in the admin panel only if a moderation
+ workflow is enabled for comments.
+ [timo]
+
- Do not allow to change the mail settings in the discussion control panel, if
there is no valid mail setup.
[timo]
diff --git a/plone/app/discussion/browser/configure.zcml b/plone/app/discussion/browser/configure.zcml
index 491f294..35c8119 100644
--- a/plone/app/discussion/browser/configure.zcml
+++ b/plone/app/discussion/browser/configure.zcml
@@ -54,6 +54,23 @@
permission="plone.app.discussion.ReviewComments"
/>
+
+
+
+
+
string:${globals_view/navigationRootUrl}/@@moderate-comments
-
+ portal/@@moderate-comments-enabled|nothing