diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4edca3fe..7089f3eea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Next version (Unreleased)
+## 2.0.4 (April 20, 2018)
 
 FEATURES:
 
diff --git a/version.txt b/version.txt
index 59e639ec1..2165f8f9b 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.4.dev
+2.0.4