diff --git a/CHANGES.txt b/CHANGES.txt
index 3d51b4a..212bc5b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,13 +1,13 @@
 Changelog
 =========
 
-2.0RC1 (unreleased)
--------------------
+2.0a1 (2011-02-07)
+------------------
 
-- Check if the current user has configured an e-mail address for the email 
-  notification option. This fixes http://dev.plone.org/plone/ticket/11428.
+- Split up development into two branches. The 1.x branch will be for Plone 3.x 
+  and Plone 4.0.x and the 2.x branch will be for Plone 4.1 and beyond.
   [timo]
-  
+
 - Import Owned from OFS.owner to avoid deprecation warnings.
   [timo]
   
@@ -22,11 +22,28 @@ Changelog
   Plone 4.1.
   [timo]
 
-- Do not check for a comment review workflow when sending out a moderator email 
-  notification. This fixes  http://dev.plone.org/plone/ticket/11444.
+
+1.0 (2011-02-07)
+----------------
+
+- Do not check for a comment review workflow when sending out a moderator email
+  notification. This fixes http://dev.plone.org/plone/ticket/11444.
+  [timo]
+  
+- Check if the current user has configured an e-mail address for the email 
+  notification option. This fixes http://dev.plone.org/plone/ticket/11428.
+  [timo]  
 
 
-1.0RC1 (unreleased)
+1.0RC2 (2011-01-24)
+-------------------
+
+- Remove moderation_enabled setting from registry to avoid migration problems
+  to 1.0RC1. This fixes http://dev.plone.org/plone/ticket/11419.
+  [timo]
+
+
+1.0RC1 (2011-01-22)
 -------------------
 
 - Always show existing comments, even if commenting is disabled. 
diff --git a/README.txt b/README.txt
index b794c30..5c13cfb 100644
--- a/README.txt
+++ b/README.txt
@@ -5,15 +5,21 @@ plone.app.discussion aims to be the new commenting system for Plone. It was
 initially developed as part of the Google Summer of Code 2009 by Timo 
 Stollenwerk (student) and Martin Aspeli (mentor).
 
-For the roadmap of the project see our `Pivotal Tracker`_.
-
-.. _`Pivotal Tracker`: http://www.pivotaltracker.com/projects/15135
+plone.app.discussion is an add-on product for Plone 3.3.x and 4.0.x and will be
+shipped as part of Plone 4.1. Make sure you pin down plone.app.discussion to
+version < 2.0 if installed as an add-on product (see install instructions below 
+for more details).
 
 Please report bugs to the `Plone bug tracker`_.
 
 .. _`Plone bug tracker`: http://dev.plone.org/plone/
 
 
+For the roadmap of the project see our `Pivotal Tracker`_.
+
+.. _`Pivotal Tracker`: http://www.pivotaltracker.com/projects/15135
+
+
 Requirements
 ============
 
@@ -29,10 +35,15 @@ To install plone.app.discussion, add the following code to your buildout.cfg::
     ...
     extends =
         ...
-        http://good-py.appspot.com/release/plone.app.discussion/1.0b12
+        http://good-py.appspot.com/release/plone.app.discussion/1.0
 
     ...
 
+    [versions]
+    plone.app.discussion < 2.0
+    
+    ...
+    
     [instance]
     ...
     eggs =
@@ -54,6 +65,7 @@ To install plone.app.discussion, add the following code to your buildout.cfg::
     versions = versions
     
     [versions]
+    plone.app.discussion < 2.0
     zope.schema = 3.6.4
     
     ...
diff --git a/docs/source/conf.py b/docs/source/conf.py
index c60c355..0f65223 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -53,7 +53,7 @@ copyright = u'2010, Timo Stollenwerk - Plone Foundation'
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0RC1'
+release = '1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index abcb55d..88c9f3f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 import sys
 from setuptools import setup, find_packages
 
-version = '2.0RC1'
+version = '2.0a1'
 
 install_requires = [
     'setuptools',