diff --git a/ChangeLog b/ChangeLog
index e51b627d..73f8bf72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-version x Unreleased
+version 2.0.0 Sat Feb 1 2020 by luispedro
 	* jug.backend.base_store has 1 new method 'listlocks'
 	* jug.backend.base_lock has 2 new methods 'fail' and 'is_failed'
 	* Add 'jug execute --keep-failed' to preserve locks on failing tasks.
diff --git a/README.rst b/README.rst
index 955b20d1..917e0755 100644
--- a/README.rst
+++ b/README.rst
@@ -130,6 +130,15 @@ reasonably large set of parameter combinations" - Andreas Longva
 What's New
 ----------
 
+version **2.0.0** (Sat Feb 1 2020)
+- jug.backend.base_store has 1 new method 'listlocks'
+- jug.backend.base_lock has 2 new methods 'fail' and 'is_failed'
+- Add 'jug execute --keep-failed' to preserve locks on failing tasks.
+- Add 'jug cleanup --failed-only' to remove locks from failed tasks
+- 'jug status' and 'jug graph' now display failed tasks
+- Check environmental exit variables by default (suggested by Renato Alves, issue #66)
+- Fix 'jug sleep-until' in the presence of barrier() (issue #71)
+
 
 version **1.6.9** (Tue Aug 6 2019)
 
diff --git a/docs/source/history.rst b/docs/source/history.rst
index e63b9e47..5090e685 100644
--- a/docs/source/history.rst
+++ b/docs/source/history.rst
@@ -2,6 +2,15 @@
 History
 =======
 
+version **2.0.0** (Sat Feb 1 2020)
+- jug.backend.base_store has 1 new method 'listlocks'
+- jug.backend.base_lock has 2 new methods 'fail' and 'is_failed'
+- Add 'jug execute --keep-failed' to preserve locks on failing tasks.
+- Add 'jug cleanup --failed-only' to remove locks from failed tasks
+- 'jug status' and 'jug graph' now display failed tasks
+- Check environmental exit variables by default (suggested by Renato Alves, issue #66)
+- Fix 'jug sleep-until' in the presence of barrier() (issue #71)
+
 version **1.6.9** (Tue Aug 6 2019)
 
 - Fix saving on newer version of numpy
diff --git a/jug/jug_version.py b/jug/jug_version.py
index 297494d6..6609f0f7 100644
--- a/jug/jug_version.py
+++ b/jug/jug_version.py
@@ -1,4 +1,4 @@
-__version__ = '1.6.9+git'
+__version__ = '2.0.0rc0'
 CITATION = '''\
     Coelho, L.P., (2017). Jug: Software for Parallel Reproducible Computation in
     Python. Journal of Open Research Software. 5(1), p.30.