diff --git a/CHANGELOG.md b/CHANGELOG.md
index dda785f5..dd5538ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
-## [Unreleased]
+## [2.0] - 2020-01-31
 
 For a more complete overview, see the [2.0
 milestone](https://gitlab.com/fdroid/fdroidserver/-/milestones/10)
diff --git a/setup.py b/setup.py
index 2a387307..252327a2 100755
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setup(name='fdroidserver',
-      version='2.0b1',
+      version='2.0',
       description='F-Droid Server Tools',
       long_description=long_description,
       long_description_content_type='text/markdown',