diff --git a/README.md b/README.md
index b660b8a..f8cc6f3 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@ and OpenStack services and APIs.
 Requirements
 ------------
 
-| Requirement                      | Version/Comment |
-|:---------------------------------|:----------------|
-| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0   |
+| Requirement                      | Version/Comment    |
+|:---------------------------------|:-------------------|
+| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 |
 
 Installation Guide
 ==================
diff --git a/doc/plugin-guide/source/changelog.rst b/doc/plugin-guide/source/changelog.rst
index 996e43d..662b5fa 100644
--- a/doc/plugin-guide/source/changelog.rst
+++ b/doc/plugin-guide/source/changelog.rst
@@ -3,7 +3,7 @@ Release notes / Changelog
 
 **2.5.1**
 
-* Compatibility with MOS 7.0, 8.0 and 9.0
+* Compatibility with MOS 7.0, 8.0, 9.0 and 9.1
 
 **2.5.0**
 
diff --git a/doc/plugin-guide/source/description.rst b/doc/plugin-guide/source/description.rst
index 1b2a00b..88a936b 100644
--- a/doc/plugin-guide/source/description.rst
+++ b/doc/plugin-guide/source/description.rst
@@ -10,11 +10,11 @@ services and APIs.
 Requirements
 ============
 
-=========== ================
+=========== =====================
 Requirement Version/Comment
-=========== ================
-Fuel        7.0, 8.0 and 9.0
-=========== ================
+=========== =====================
+Fuel        7.0, 8.0, 9.0 and 9.1
+=========== =====================
 
 Operational limitations
 =======================
diff --git a/doc/plugin-guide/source/guide.rst b/doc/plugin-guide/source/guide.rst
index 4a0b0c8..74b7905 100644
--- a/doc/plugin-guide/source/guide.rst
+++ b/doc/plugin-guide/source/guide.rst
@@ -41,6 +41,8 @@ Known problems
   therefore and in the exact same manner than `1531834 <https://bugs.launchpad.net/fuel-plugins/+bug/1531834>`_ can impact disk space,
   this can have a significant CPU and/or memory usage on controller nodes for large deployment.
 
+- Error when deploying on MOS 9.0 env with modified hostnames (see bug `1633701 <https://bugs.launchpad.net/fuel/+bug/1633701>`_).
+
 Environment configuration
 =========================
 
diff --git a/doc/plugin-guide/source/limitations.rst b/doc/plugin-guide/source/limitations.rst
index 67f6973..65dc25b 100644
--- a/doc/plugin-guide/source/limitations.rst
+++ b/doc/plugin-guide/source/limitations.rst
@@ -20,7 +20,7 @@ The Zabbix plugin does not support reduced footprint deployment for Fuel 7.0
 and Fuel 8.0. `LP1610217 <https://bugs.launchpad.net/fuel/+bug/1610217>`_
 
 The Zabbix plugin version 2.5.1 supports the reduced footprint deployment
-with Fuel 9.0 **only**. To deploy a corresponding OpenStack environment:
+with Fuel 9.x **only**. To deploy a corresponding OpenStack environment:
 
 #. Enable the `reduced footprint <https://docs.mirantis.com/openstack/fuel/fuel-master/operations/reduced-footprint-ops.html>`_
    feature and deploy all ``virt`` nodes **without** enabling the Zabbix
@@ -30,4 +30,4 @@ with Fuel 9.0 **only**. To deploy a corresponding OpenStack environment:
    in the Fuel web UI.
 
 #. Deploy your OpenStack environment as usual (controller, compute, and other nodes
-   as required).
\ No newline at end of file
+   as required).
diff --git a/doc/plugin-guide/source/revisionhistory.rst b/doc/plugin-guide/source/revisionhistory.rst
index 2883341..23d4e81 100644
--- a/doc/plugin-guide/source/revisionhistory.rst
+++ b/doc/plugin-guide/source/revisionhistory.rst
@@ -47,5 +47,8 @@ Version Revision date Editor                       Comment
 ------- ------------- ---------------------------- ---------------------
 2.5.1   07.20.2016    Olivier Bourdon              Added MOS 9.0 support
                       (obourdon@mirantis.com)      
+------- ------------- ---------------------------- ---------------------
+2.5.1   10.19.2016    Olivier Bourdon              Added MOS 9.1 support
+                      (obourdon@mirantis.com)      
 ======= ============= ============================ =====================
 
diff --git a/doc/qa/source/test-strategy.rst b/doc/qa/source/test-strategy.rst
index ed701d4..33723fc 100644
--- a/doc/qa/source/test-strategy.rst
+++ b/doc/qa/source/test-strategy.rst
@@ -23,11 +23,11 @@ Test environment, infrastructure and tools
 Product compatibility matrix
 ============================
 
-+--------------------+-----------------+
-| Product            | Version/Comment |
-+====================+=================+
-| Mirantis OpenStack | 7.0, 8.0 and 9.0|
-+--------------------+-----------------+
-| Zabbix monitoring  | 2.5.1           |
-+--------------------+-----------------+
++--------------------+----------------------+
+| Product            | Version/Comment      |
++====================+======================+
+| Mirantis OpenStack | 7.0, 8.0, 9.0 and 9.1|
++--------------------+----------------------+
+| Zabbix monitoring  | 2.5.1                |
++--------------------+----------------------+
 
diff --git a/doc/specs/source/index.rst b/doc/specs/source/index.rst
index bbb8220..35ca608 100644
--- a/doc/specs/source/index.rst
+++ b/doc/specs/source/index.rst
@@ -120,7 +120,7 @@ Work Items
 Dependencies
 ============
 
-* Fuel 7.0, 8.0 and 9.0
+* Fuel 7.0, 8.0, 9.0 and 9.1
 
 Testing
 =======