diff --git a/CHANGES.txt b/CHANGES.txt
index d3d4c23..8d43bc6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.0.7 (unreleased)
+------------------
+
+- Fix discussion control panel submit. This fixes ttps://dev.plone.org/plone/ticket/11486.
+
+
 2.0.6 (2011-07-04)
 ------------------
 
diff --git a/plone/app/discussion/browser/javascripts/controlpanel.js b/plone/app/discussion/browser/javascripts/controlpanel.js
index c87be6f..d1fc2ce 100644
--- a/plone/app/discussion/browser/javascripts/controlpanel.js
+++ b/plone/app/discussion/browser/javascripts/controlpanel.js
@@ -119,7 +119,7 @@
          * the required attributes.
          **********************************************************************/
         $("input[name='form.buttons.save']").bind("click", function (e) {
-            //e.preventDefault();
+            e.preventDefault();
             var form = $(this).parents("form");
             $(form).find("input,select").removeAttr('disabled');
             $(form).submit();
diff --git a/setup.py b/setup.py
index bcb2aff..29b7e9f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '2.0.6'
+version = '2.0.7'
 
 install_requires = [
     'setuptools',