diff --git a/CHANGES.txt b/CHANGES.txt
index 742dd94..ba11c04 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 1.0b5 (unreleased)
 ------------------
 
+* Use self.form instead of CommentForm for the CommentsViewlet update method so 
+  integrators don't have to override the viewlet's update method. 
+  [Matous]
+
 * Make sure the form fields in the reply form are always placed under the field 
   labels. 
   [timo]
diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py
index 4b8a108..1a9f38a 100644
--- a/plone/app/discussion/browser/comments.py
+++ b/plone/app/discussion/browser/comments.py
@@ -205,7 +205,7 @@ class CommentsViewlet(ViewletBase):
     def update(self):
         super(CommentsViewlet, self).update()
         z2.switch_on(self, request_layer=IFormLayer)
-        self.form = CommentForm(aq_inner(self.context), self.request)
+        self.form = self.form(aq_inner(self.context), self.request)
         if HAS_WRAPPED_FORM: 
             alsoProvides(self.form, IWrappedForm) 
         self.form.update()