diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffd684087..5bc216e00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Next version (Unreleased)
+## 2.1.0 (May 3, 2018)
 
 FEATURES:
 
diff --git a/version.txt b/version.txt
index 929b8e35e..7ec1d6db4 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.5.dev
+2.1.0