diff --git a/README.md b/README.md
index bdc4f24..6675069 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ The `ScaleIO` plugin allows to:
 | Requirement                      | Version/Comment |
 |----------------------------------|-----------------|
 | Mirantis OpenStack               | 8.0             |
+| Mirantis OpenStack               | 9.0             |
 
 ## Recommendations
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index bac7bc6..4314a4a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -11,8 +11,8 @@ master_doc = 'index'
 project = u'The ScaleIO plugin for Fuel'
 copyright = u'2016, EMC Corporation'
 
-version = '2.1-2.1.0-1'
-release = '2.1-2.1.0-1'
+version = '2.1-2.1.1-1'
+release = '2.1-2.1.1-1'
 
 exclude_patterns = []
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index d091a11..0b857f0 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,5 +1,5 @@
 ===================================================
-Guide to the ScaleIOv2.0 Plugin for Fuel 8.0
+Guide to the ScaleIOv2.0 Plugin for Fuel 8.0, 9.0
 ===================================================
 
 Plugin Guide
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
index 2935ee2..8227a03 100644
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -13,7 +13,7 @@ To install the ScaleIOv2.0 Fuel plugin:
 #. Copy the *rpm* file to the Fuel Master node:
    ::
 
-      [root@home ~]# scp scaleio-2.1-2.1.0-1.noarch.rpm
+      [root@home ~]# scp scaleio-2.1-2.1.1-1.noarch.rpm
       root@fuel-master:/tmp
 
 #. Log into Fuel Master node and install the plugin using the
@@ -21,14 +21,14 @@ To install the ScaleIOv2.0 Fuel plugin:
    ::
 
       [root@fuel-master ~]# fuel plugins --install
-      /tmp/scaleio-2.1-2.1.0-1.noarch.rpm
+      /tmp/scaleio-2.1-2.1.1-1.noarch.rpm
 
 #. Verify that the plugin is installed correctly:
    ::
      [root@fuel-master ~]# fuel plugins
      id | name                  | version | package_version
      ---|-----------------------|---------|----------------
-      1 | scaleio               | 2.1.0   | 3.0.0
+      1 | scaleio               | 2.1.1   | 3.0.0
 
 
 .. _Fuel Plugins Catalog: https://www.mirantis.com/products/openstack-drivers-and-plugins/fuel-plugins/
diff --git a/doc/source/introduction.rst b/doc/source/introduction.rst
index 43542cb..5b2ba3a 100644
--- a/doc/source/introduction.rst
+++ b/doc/source/introduction.rst
@@ -46,13 +46,14 @@ Requirements
 Requirement               Version/Comment
 ========================= ===============
 Mirantis OpenStack        8.0
+Mirantis OpenStack        9.0
 ========================= ===============
 
 
 Limitations
 -----------
 
-1. Plugin is only compatible with Mirantis Fuel 8.0.
+1. Plugin is compatible with Mirantis Fuel 8.0 and 9.0.
 2. Plugin supports only Ubuntu environment.
 3. Only hyper converged environment is supported - there is no separate ScaleIO Storage nodes.
 4. Multi storage backend is not supported.
diff --git a/doc/testing/TestPlanforScaleIOFuelPlugin.docx b/doc/testing/TestPlanforScaleIOFuelPlugin.docx
index 896b5cc..dd3ba95 100644
Binary files a/doc/testing/TestPlanforScaleIOFuelPlugin.docx and b/doc/testing/TestPlanforScaleIOFuelPlugin.docx differ
diff --git a/doc/testing/TestPlanforScaleIOFuelPlugin.pages b/doc/testing/TestPlanforScaleIOFuelPlugin.pages
index 99bf8a4..393c443 100644
Binary files a/doc/testing/TestPlanforScaleIOFuelPlugin.pages and b/doc/testing/TestPlanforScaleIOFuelPlugin.pages differ
diff --git a/doc/testing/TestReportScaleIOFuelPlugin.pages b/doc/testing/TestReportScaleIOFuelPlugin.pages
index ecac623..7c7b058 100644
Binary files a/doc/testing/TestReportScaleIOFuelPlugin.pages and b/doc/testing/TestReportScaleIOFuelPlugin.pages differ
diff --git a/metadata.yaml b/metadata.yaml
index 443fe83..5371fb8 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,7 +5,7 @@ name: scaleio
 title: ScaleIOv2.0 plugin
 
 # Plugin version
-version: '2.1.0'
+version: '2.1.1'
 
 # Description
 description: This plugin deploys and enables EMC ScaleIO ver. 2.0 as the block storage backend
diff --git a/pre_build_hook b/pre_build_hook
index 20bad0a..f0b4dc8 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -11,7 +11,7 @@
 
 set -eux
 
-RELEASE=${RELEASE_TAG:-"v1.0.0"}
+RELEASE=${RELEASE_TAG:-"v1.0.1"}
 
 #TODO: use ftp.emc.com
 BASE_REPO_URL="http://scaleio-packages.s3-website-us-east-1.amazonaws.com"