diff --git a/ChangeLog.rst b/ChangeLog.rst
index bcaead57..5fce6b08 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,37 @@
 Changelog
 =========
 
+v2.2.0 (Wed, 5 Apr 2017)
+------------------------------
+
+Feature list:
+
+* Major improvements to the web user interface
+
+* Support for showing progress of ongoing measurements
+
+* Add icons to decks
+
+* Show in measurements view the deck that generated a certain test
+
+* Support unix-socket tor control ports #479 (thanks @ioef)
+
+* Better explaination for -g option #498 (thanks @ioef)
+
+* Improvements to some docstring (thanks @donald213)
+
+* Add support for internationalizations
+
+* Support Spanish, French, Italian, English and Hindi
+
+Bug fixes:
+
+* Fix bug in deleting of old resources
+
+* Update to new key for lepidopter-update
+
+ooniprobe-wui version: 2.2.0
+
 v2.2.0-rc.2 (Mon, 13 Mar 2017)
 ------------------------------
 
diff --git a/Makefile b/Makefile
index 500a479e..c06d2bab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 2.2.0rc2
+VERSION = 2.2.0
 
 man:
 	cd docs && make man
diff --git a/data/oonideckgen.1 b/data/oonideckgen.1
index 4216c740..59315ca1 100644
--- a/data/oonideckgen.1
+++ b/data/oonideckgen.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "OONIDECKGEN" "1" "Mar 13, 2017" "2.2.0.rc2" "OONI: Open Observatory of Network Interference"
+.TH "OONIDECKGEN" "1" "Apr 05, 2017" "2.2.0" "OONI: Open Observatory of Network Interference"
 .SH NAME
 oonideckgen \- DEPRECATED ooni tool
 .
diff --git a/data/ooniprobe-agent.1 b/data/ooniprobe-agent.1
index c9bd717c..a3406459 100644
--- a/data/ooniprobe-agent.1
+++ b/data/ooniprobe-agent.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "OONIPROBE-AGENT" "1" "Mar 13, 2017" "2.2.0.rc2" "OONI: Open Observatory of Network Interference"
+.TH "OONIPROBE-AGENT" "1" "Apr 05, 2017" "2.2.0" "OONI: Open Observatory of Network Interference"
 .SH NAME
 ooniprobe-agent \- an internet censorship measurement tool, system daemon.
 .
diff --git a/data/ooniprobe.1 b/data/ooniprobe.1
index 29e2d4a3..72e36482 100644
--- a/data/ooniprobe.1
+++ b/data/ooniprobe.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "OONIPROBE" "1" "Mar 13, 2017" "2.2.0.rc2" "OONI: Open Observatory of Network Interference"
+.TH "OONIPROBE" "1" "Apr 05, 2017" "2.2.0" "OONI: Open Observatory of Network Interference"
 .SH NAME
 ooniprobe \- an internet censorship measurement tool
 .
diff --git a/data/oonireport.1 b/data/oonireport.1
index bf345255..754f960c 100644
--- a/data/oonireport.1
+++ b/data/oonireport.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "OONIREPORT" "1" "Mar 13, 2017" "2.2.0.rc2" "OONI: Open Observatory of Network Interference"
+.TH "OONIREPORT" "1" "Apr 05, 2017" "2.2.0" "OONI: Open Observatory of Network Interference"
 .SH NAME
 oonireport \- upload ooniprobe measurements
 .
diff --git a/data/ooniresources.1 b/data/ooniresources.1
index 0947f287..c7ef9262 100644
--- a/data/ooniresources.1
+++ b/data/ooniresources.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "OONIRESOURCES" "1" "Mar 13, 2017" "2.2.0.rc2" "OONI: Open Observatory of Network Interference"
+.TH "OONIRESOURCES" "1" "Apr 05, 2017" "2.2.0" "OONI: Open Observatory of Network Interference"
 .SH NAME
 ooniresources \- DEPRECATED ooni tool
 .
diff --git a/ooni/__init__.py b/ooni/__init__.py
index 18bc94b6..abca74c1 100644
--- a/ooni/__init__.py
+++ b/ooni/__init__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 __author__ = "Open Observatory of Network Interference"
-__version__ = "2.2.0.rc2"
+__version__ = "2.2.0"
 
 __all__ = [
     'agent',