diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
index 0059f88ed..1d7ae4227 100644
--- a/Documentation/Changelog.md
+++ b/Documentation/Changelog.md
@@ -55,6 +55,7 @@ For more details, please refer to:
 * MaxScale now supports IPv6
 
 For more details, please refer to:
+* [MariaDB MaxScale 2.1.16 Release Notes](Release-Notes/MaxScale-2.1.16-Release-Notes.md)
 * [MariaDB MaxScale 2.1.15 Release Notes](Release-Notes/MaxScale-2.1.15-Release-Notes.md)
 * [MariaDB MaxScale 2.1.14 Release Notes](Release-Notes/MaxScale-2.1.14-Release-Notes.md)
 * [MariaDB MaxScale 2.1.13 Release Notes](Release-Notes/MaxScale-2.1.13-Release-Notes.md)
diff --git a/Documentation/Release-Notes/MaxScale-2.1.16-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.16-Release-Notes.md
new file mode 100644
index 000000000..f2681cd85
--- /dev/null
+++ b/Documentation/Release-Notes/MaxScale-2.1.16-Release-Notes.md
@@ -0,0 +1,31 @@
+# MariaDB MaxScale 2.1.16 Release Notes -- 2018-04
+
+Release 2.1.16 is a GA release.
+
+This document describes the changes in release 2.1.16, when compared
+to release [2.1.15](MaxScale-2.1.15-Release-Notes.md).
+
+For any problems you encounter, please consider submitting a bug report at
+[Jira](https://jira.mariadb.org).
+
+## Bug fixes
+
+[Here is a list of bugs fixed in MaxScale 2.1.16.](https://jira.mariadb.org/issues/?jql=project%20%3D%20MXS%20AND%20issuetype%20%3D%20Bug%20AND%20status%20%3D%20Closed%20AND%20fixVersion%20%3D%202.1.16)
+
+* [MXS-1739](https://jira.mariadb.org/browse/MXS-1739) OpenSSL session caching is enabled
+* [MXS-1730](https://jira.mariadb.org/browse/MXS-1730) Column alias named engine without backticks returns an error
+
+## Packaging
+
+RPM and Debian packages are provided for the Linux distributions supported by
+MariaDB Enterprise.
+
+Packages can be downloaded [here](https://mariadb.com/resources/downloads).
+
+## 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.
+
+The source code is available [here](https://github.com/mariadb-corporation/MaxScale).
diff --git a/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md b/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md
index 625fc5e7d..a248c0cd5 100644
--- a/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md
+++ b/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md
@@ -6,22 +6,6 @@ MariaDB MaxScale from version 2.0 to 2.1.
 For more information about MariaDB MaxScale 2.1, please refer to the
 [ChangeLog](../Changelog.md).
 
-For a complete list of changes in MaxScale 2.1, refer to the
-* [MaxScale 2.1.13 Release Notes](../Release-Notes/MaxScale-2.1.13-Release-Notes.md)
-* [MaxScale 2.1.12 Release Notes](../Release-Notes/MaxScale-2.1.12-Release-Notes.md)
-* [MaxScale 2.1.11 Release Notes](../Release-Notes/MaxScale-2.1.11-Release-Notes.md)
-* [MaxScale 2.1.10 Release Notes](../Release-Notes/MaxScale-2.1.10-Release-Notes.md)
-* [MaxScale 2.1.9 Release Notes](../Release-Notes/MaxScale-2.1.9-Release-Notes.md).
-* [MaxScale 2.1.8 Release Notes](../Release-Notes/MaxScale-2.1.8-Release-Notes.md).
-* [MaxScale 2.1.7 Release Notes](../Release-Notes/MaxScale-2.1.7-Release-Notes.md).
-* [MaxScale 2.1.6 Release Notes](../Release-Notes/MaxScale-2.1.6-Release-Notes.md).
-* [MaxScale 2.1.5 Release Notes](../Release-Notes/MaxScale-2.1.5-Release-Notes.md).
-* [MaxScale 2.1.4 Release Notes](../Release-Notes/MaxScale-2.1.4-Release-Notes.md).
-* [MaxScale 2.1.3 Release Notes](../Release-Notes/MaxScale-2.1.3-Release-Notes.md).
-* [MaxScale 2.1.2 Release Notes](../Release-Notes/MaxScale-2.1.2-Release-Notes.md).
-* [MaxScale 2.1.1 Release Notes](../Release-Notes/MaxScale-2.1.1-Release-Notes.md).
-* [MaxScale 2.1.0 Release Notes](../Release-Notes/MaxScale-2.1.0-Release-Notes.md).
-
 ## Installation
 
 Before starting the upgrade, we **strongly** recommend you back up your current