diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
index f9cb04d23..444f32400 100644
--- a/Documentation/Changelog.md
+++ b/Documentation/Changelog.md
@@ -79,6 +79,7 @@ For more details, please refer to:
   the master. There is also limited capability for rejoining nodes.
 
 For more details, please refer to:
+* [MariaDB MaxScale 2.2.21 Release Notes](Release-Notes/MaxScale-2.2.21-Release-Notes.md)
 * [MariaDB MaxScale 2.2.20 Release Notes](Release-Notes/MaxScale-2.2.20-Release-Notes.md)
 * [MariaDB MaxScale 2.2.19 Release Notes](Release-Notes/MaxScale-2.2.19-Release-Notes.md)
 * [MariaDB MaxScale 2.2.18 Release Notes](Release-Notes/MaxScale-2.2.18-Release-Notes.md)
diff --git a/Documentation/Release-Notes/MaxScale-2.2.21-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.21-Release-Notes.md
new file mode 100644
index 000000000..6a074ea88
--- /dev/null
+++ b/Documentation/Release-Notes/MaxScale-2.2.21-Release-Notes.md
@@ -0,0 +1,41 @@
+# MariaDB MaxScale 2.2.21 Release Notes -- 2019-05-08
+
+Release 2.2.21 is a GA release.
+
+This document describes the changes in release 2.2.21, when compared to the
+previous release in the same series.
+
+For any problems you encounter, please consider submitting a bug
+report on [our Jira](https://jira.mariadb.org/projects/MXS).
+
+## Bug fixes
+
+* [MXS-2410](https://jira.mariadb.org/browse/MXS-2410) Hangup delivered to wrong DCB
+* [MXS-2366](https://jira.mariadb.org/browse/MXS-2366) Wrong tarball RPATH
+
+## Changes to MariaDB-Monitor failover
+
+Failover is no longer disabled permanently if it or any other cluster operation fails.
+The disabling is now only temporary and lasts for 'failcount' monitor iterations. Check
+[MariaDB-Monitor documentation](../Monitors/MariaDB-Monitor.md#limitations-and-requirements)
+for more information.
+
+## Known Issues and Limitations
+
+There are some limitations and known issues within this version of MaxScale.
+For more information, please refer to the [Limitations](../About/Limitations.md) document.
+
+## Packaging
+
+RPM and Debian packages are provided for supported the Linux distributions.
+
+Packages can be downloaded [here](https://mariadb.com/downloads/mariadb-tx/maxscale).
+
+## Source Code
+
+The source code of MaxScale is tagged at GitHub with a tag, which is identical
+with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale
+is `maxscale-X.Y.Z`. Further, the default branch is always the latest GA version
+of MaxScale.
+
+The source code is available [here](https://github.com/mariadb-corporation/MaxScale).
diff --git a/VERSION22.cmake b/VERSION22.cmake
index 13684f7f5..84ea47e2e 100644
--- a/VERSION22.cmake
+++ b/VERSION22.cmake
@@ -5,7 +5,7 @@
 
 set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
 set(MAXSCALE_VERSION_MINOR "2" CACHE STRING "Minor version")
-set(MAXSCALE_VERSION_PATCH "21" CACHE STRING "Patch version")
+set(MAXSCALE_VERSION_PATCH "22" CACHE STRING "Patch version")
 
 # This should only be incremented if a package is rebuilt
 set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")