diff --git a/CHANGELOG b/CHANGELOG
index e532a5d868..b25add96c6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+Version 2.0.0 - 2011-04-26
+* Bug fixes (see mercurial logs for details)
 * Use md5 hash for indexing translation
 * Merge tree and list views
 * Added autocompletion on fields.Char
diff --git a/COPYRIGHT b/COPYRIGHT
index bab90c9e3e..6c994d4a71 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2007-2010 Cédric Krier.
-Copyright (C) 2007-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2007-2011 Cédric Krier.
+Copyright (C) 2007-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/doc/conf.py b/doc/conf.py
index 510feee33a..1a76d5bf3a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -40,16 +40,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'trytond'
-copyright = u'2008-2010, Bertrand Chenal, Cédric Krier, Ian Wilson, Udo Spallek'
+copyright = u'2008-2011, Bertrand Chenal, Cédric Krier, Ian Wilson, Udo Spallek'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.9'
+version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.9'
+release = '2.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 c418a94582..553412e1be 100644
--- a/setup.py
+++ b/setup.py
@@ -42,13 +42,17 @@ setup(name=PACKAGE,
         'Environment :: No Input/Output (Daemon)',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: Bulgarian',
+        'Natural Language :: Dutch',
         'Natural Language :: English',
         'Natural Language :: French',
         'Natural Language :: German',
         'Natural Language :: Russian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
     ],
     license=LICENSE,
diff --git a/trytond/version.py b/trytond/version.py
index 3d380a25ce..684428792e 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,7 +1,7 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "1.9.0"
+VERSION = "2.0.0"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"