diff --git a/CHANGES.txt b/CHANGES.txt
index 4ea5e54..4b7d0a5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,9 +4,13 @@ Changelog
 1.0b11 (unreleased)
 -------------------
 
+- Rename the id of the comment form from "form" to "comment-form".
+  [timo]
+
 - Fixed handling of non-ascii member data, like fullname and email.
   [hannosch]
 
+
 1.0b10 (2010-10-15)
 -------------------
 
diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py
index 8a85457..fd01790 100644
--- a/plone/app/discussion/browser/comments.py
+++ b/plone/app/discussion/browser/comments.py
@@ -47,6 +47,7 @@ except ImportError: # pragma: no cover
 class CommentForm(extensible.ExtensibleForm, form.Form):
 
     ignoreContext = True # don't use context to get widget data
+    id = "comment-form"
     label = _(u"Add a comment")
     fields = field.Fields(IComment).omit('portal_type',
                                          '__parent__',