Merge branch '4.11'
diff --git a/source/about.rst b/source/about.rst
index 900206b..4fb4dcd 100644
--- a/source/about.rst
+++ b/source/about.rst
@@ -17,14 +17,18 @@
 What's New in |version|
 =======================
 
-Version |version| is a maintainance release containing over 140 fixes and improvements on the 4.11.0 release.
+What's New in 4.11.1.0
+----------------------
 
-These include the speeding up of virtual router deployments and fixes for corner cases 
+The new 4.11.1.0 version is a |version| maintainance release containing over 140
+fixes and improvements on the 4.11.0.0 release.
+
+These include the speeding up of virtual router deployments and fixes for corner cases
 effecting the new config drive and L2 features and some hypervisor specific fixes to improve compatibility
 with current hypervisor versions including the XCP-ng fork of XenServer.
 
 What's New in 4.11.0.0
-======================
+----------------------
 
 Version 4.11.0.0 included more than 400 commits, 220 pull requests that fixes
 more than 250 issues since the last release. Version 4.11.0.0 was a large
diff --git a/source/compat.rst b/source/compat.rst
index ed60141..d134391 100644
--- a/source/compat.rst
+++ b/source/compat.rst
@@ -32,7 +32,7 @@
 ~~~~~~~~~~~~~~~~~~~~~
 
 -  Java JRE 1.8
--  MySQL 5.6 (RHEL 7)
+-  MySQL 5.6, 5.7 (RHEL 7)
 -  MySQL 5.1 (RHEL 6.x)
 
 Supported Hypervisor Versions
@@ -42,9 +42,9 @@
 and VMware with vSphere.
 
 -  CentOS 6.2+, 7.0+ with KVM
--  Ubuntu 14.04LTS, 16.04LTS+ with KVM
+-  Ubuntu 14.04LTS, 16.04LTS, 18.04LTS with KVM
 -  Red Hat Enterprise Linux 6.2 with KVM
--  XenServer versions 6.1, 6.2 SP1, 6.5, 7.0, 7.1, 7.2 with latest hotfixes
+-  XenServer versions 6.1, 6.2 SP1, 6.5, 7.0, 7.1, 7.2 with latest hotfixes, XCP-ng 7.4
 
    .. note:: It is now required to enable HA on the XenServer pool in order to recover from a pool-master failure. Please refer to the `XenServer documentation <http://docs.vmd.citrix.com/XenServer/6.5.0/1.0/en_gb/>`_.
 
diff --git a/source/fixed_issues.rst b/source/fixed_issues.rst
index 9f9ff7e..2b1c131 100644
--- a/source/fixed_issues.rst
+++ b/source/fixed_issues.rst
@@ -26,7 +26,7 @@
 
 
 Issues Fixed in 4.11.1.0
-========================
+------------------------
 
 .. cssclass:: table-striped table-bordered table-hover
 
@@ -743,8 +743,8 @@
 .. _`#2431`: https://github.com/apache/cloudstack/pull/2431
 .. _CLOUDSTACK-10225: https://issues.apache.org/jira/browse/CLOUDSTACK-10225
 
-Issues Fixed in 4.11.0
-----------------------
+Issues Fixed in 4.11.0.0
+------------------------
 
 .. cssclass:: table-striped table-bordered table-hover
 
diff --git a/source/upgrade/upgrade_notes.rst b/source/upgrade/upgrade_notes.rst
index e2cd86d..2e98da9 100644
--- a/source/upgrade/upgrade_notes.rst
+++ b/source/upgrade/upgrade_notes.rst
@@ -37,6 +37,19 @@
 Please read more about `using dynamic roles <http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/4.9/accounts.html#using-dynamic-roles>`_
 feature and process of migrating to using this after an upgrade.
 
+Agent and KVM Host Security
+---------------------------
+
+Starting 4.11, a new CA framework has been introduced that is used to secure
+agent and management server connections. Starting 4.11.1, KVM hosts in UP
+state that are not secured (i.e. the KVM host agent and libvirtd don't have
+CA framework provisioned X509 certificates) will show up as 'Unsecure'. A new
+button in the UI is available as well as an API to secure and onboard such
+hosts.
+
+Please read more about `host security <http://docs.cloudstack.apache.org/projects/cloudstack-administration/en/latest/hosts.html#security>`_
+and process of migrating existing KVM hosts and agents to use the new security
+feature.
 
 OVS plug-in
 -----------