diff --git a/CHANGELOG b/CHANGELOG
index ced97947e0..fcc568aa3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+Version 3.6.0 - 2015-04-20
+* Bug fixes (see mercurial logs for details)
 * Add support for PyPy
 * Set sale shipment cost on sale only at quotation
 * Allow to change the carrier until the shipment is done
diff --git a/COPYRIGHT b/COPYRIGHT
index 36b0b21ba9..501e672bd9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2014 Cédric Krier.
+Copyright (C) 2011-2015 Cédric Krier.
 Copyright (C) 2011-2013 Bertrand Chenal.
-Copyright (C) 2011-2014 Nicolas Évrard.
-Copyright (C) 2011-2014 B2CK SPRL.
+Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-2015 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/tryton.cfg b/tryton.cfg
index cddf662e3a..5fb8c23442 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.5.0
+version=3.6.0
 depends:
     account_invoice
     carrier