diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82fa7b0b5..a2430d64b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,4 @@
-## Next version (Unreleased)
-
-FEATURES:
+## 2.1.1 (May 7, 2018)
 
 IMPROVEMENTS:
 
diff --git a/version.txt b/version.txt
index cbc67a5b5..3e3c2f1e5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.1.1.dev
+2.1.1