diff --git a/CHANGES.txt b/CHANGES.txt
index f6b41ce..9768b9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,9 @@ Changelog
 1.0RC1 (unreleased)
 -------------------
 
+- Disable discussion by default.
+  [timo]
+  
 - Move discussion action item from actionicons.xml to actions.xml to avoid 
   deprecation warning.
   [timo]
diff --git a/plone/app/discussion/interfaces.py b/plone/app/discussion/interfaces.py
index 7083e15..7543f6b 100644
--- a/plone/app/discussion/interfaces.py
+++ b/plone/app/discussion/interfaces.py
@@ -29,7 +29,7 @@ class IDiscussionSettings(Interface):
                          "specific content types, folders or content objects "
                          "before users will be able to post comments."),
         required=False,
-        default=True,
+        default=False,
         )
     
     anonymous_comments = schema.Bool(
diff --git a/plone/app/discussion/tests/functional_test_comment_review_workflow.txt b/plone/app/discussion/tests/functional_test_comment_review_workflow.txt
index 324cbb5..8ee2229 100644
--- a/plone/app/discussion/tests/functional_test_comment_review_workflow.txt
+++ b/plone/app/discussion/tests/functional_test_comment_review_workflow.txt
@@ -34,6 +34,15 @@ you're not logged in::
 
     >>> unprivileged_browser = Browser(app)
 
+Enable commenting.
+
+    >>> from zope.component import queryUtility
+    >>> from plone.registry.interfaces import IRegistry
+    >>> from plone.app.discussion.interfaces import IDiscussionSettings
+    >>> registry = queryUtility(IRegistry)
+    >>> settings = registry.forInterface(IDiscussionSettings)
+    >>> settings.globally_enabled = True
+
 
 Enable comment review workflow
 ------------------------------
diff --git a/plone/app/discussion/tests/functional_test_comments.txt b/plone/app/discussion/tests/functional_test_comments.txt
index c05508d..8d4dd66 100644
--- a/plone/app/discussion/tests/functional_test_comments.txt
+++ b/plone/app/discussion/tests/functional_test_comments.txt
@@ -38,6 +38,18 @@ Make sure we have a test user from the layer and it uses fancy characters:
     >>> mtool.getMemberById('jim').getProperty('fullname')
     'Jim Fult\xc3\xb8rn'
 
+Enable commenting.
+
+    >>> from zope.component import queryUtility
+    >>> from plone.registry.interfaces import IRegistry
+    >>> from plone.app.discussion.interfaces import IDiscussionSettings
+    >>> registry = queryUtility(IRegistry)
+    >>> settings = registry.forInterface(IDiscussionSettings)
+    >>> settings.globally_enabled = True
+    
+    >>> import transaction
+    >>> transaction.commit()    
+    
 Create a public page with comments allowed.
 
     >>> browser.open(portal_url)
diff --git a/plone/app/discussion/tests/test_comments_viewlet.py b/plone/app/discussion/tests/test_comments_viewlet.py
index 70bcc28..8ae57ee 100644
--- a/plone/app/discussion/tests/test_comments_viewlet.py
+++ b/plone/app/discussion/tests/test_comments_viewlet.py
@@ -52,7 +52,12 @@ class TestCommentForm(PloneTestCase):
         self.memberdata = self.portal.portal_memberdata
         self.request = self.app.REQUEST
         self.context = getattr(self.portal, 'doc1')
-        
+
+        # Allow discussion
+        registry = queryUtility(IRegistry)
+        settings = registry.forInterface(IDiscussionSettings)
+        settings.globally_enabled = True
+                
     def test_add_comment(self):
         """Post a comment as logged-in user.
         """
@@ -220,6 +225,11 @@ class TestCommentsViewlet(PloneTestCase):
         context = getattr(self.portal, 'doc1')
         self.viewlet = CommentsViewlet(context, request, None, None)
 
+        # Allow discussion
+        registry = queryUtility(IRegistry)
+        settings = registry.forInterface(IDiscussionSettings)
+        settings.globally_enabled = True
+        
     def test_cook(self):
         text = """First paragraph
         
diff --git a/plone/app/discussion/tests/test_controlpanel.py b/plone/app/discussion/tests/test_controlpanel.py
index 949601a..9ba8f73 100644
--- a/plone/app/discussion/tests/test_controlpanel.py
+++ b/plone/app/discussion/tests/test_controlpanel.py
@@ -46,7 +46,7 @@ class RegistryTest(PloneTestCase):
         self.assertEquals(
             self.registry['plone.app.discussion.interfaces.' +
                           'IDiscussionSettings.globally_enabled'], 
-            True)
+            False)
 
     def test_anonymous_comments(self):
         # Check anonymous_comments record
diff --git a/plone/app/discussion/tests/test_conversation.py b/plone/app/discussion/tests/test_conversation.py
index 0e755a9..107d62f 100644
--- a/plone/app/discussion/tests/test_conversation.py
+++ b/plone/app/discussion/tests/test_conversation.py
@@ -32,7 +32,11 @@ class ConversationTest(PloneTestCase):
         self.portal_discussion = getToolByName(self.portal, 
                                                'portal_discussion', 
                                                None)
-
+        # Allow discussion
+        registry = queryUtility(IRegistry)
+        settings = registry.forInterface(IDiscussionSettings)
+        settings.globally_enabled = True
+        
     def test_add_comment(self):
         # Create a conversation. In this case we doesn't assign it to an
         # object, as we just want to check the Conversation object API.