diff --git a/README.rst b/README.rst
index a5f35e6ff..f191ecaf0 100644
--- a/README.rst
+++ b/README.rst
@@ -7,6 +7,13 @@ Task Orchestration and Scheduling service for OpenStack cloud
 Installation
 ------------
 
+**Devstack installation**
+
+Information about how to install Mistral with devstack can be found here_: https://github.com/stackforge/mistral/tree/master/contrib/devstack
+
+
+**Local installation**
+
 First of all, in a shell run:
 
     tox
@@ -79,10 +86,8 @@ Tests
 
 There is an ability to run part of functional tests in non-openstack mode locally. To do this:
 
-    # set *auth_enable=false* in the mistral.conf and restart Mistral
-    # execute:
-
-        bash run_functional_tests.sh
+    1. set *auth_enable=false* in the mistral.conf and restart Mistral
+    2. execute: *./run_functional_tests.sh*
 
 To run tests for only one version need to specify it: bash run_functional_tests.sh v1
 
diff --git a/contrib/devstack/README.rst b/contrib/devstack/README.rst
index 92e1924c5..37d584e05 100644
--- a/contrib/devstack/README.rst
+++ b/contrib/devstack/README.rst
@@ -1,15 +1,24 @@
 1. Follow Devstack documentation to setup a host for Devstack. Then clone
-   Devstack source code.
+   Devstack source code::
+
+      $ git clone https://github.com/openstack-dev/devstack
+
+2. Clone Mistral source code::
+
+      $ git clone https://github.com/stackforge/mistral
 
 2. Copy Mistral integration scripts to Devstack::
 
-      $ cp lib/mistral ${DEVSTACK_DIR}/lib
-      $ cp extras.d/70-mistral.sh ${DEVSTACK_DIR}/extras.d
+      $ cp mistral/contrib/devstack/lib/mistral ${DEVSTACK_DIR}/lib
+      $ cp mistral/contrib/devstack/extras.d/70-mistral.sh ${DEVSTACK_DIR}/extras.d/
 
-3. Create a ``local.conf`` file as input to devstack.
+3. Create/modify a ``localrc`` file as input to devstack.
 
-4. The Mistral service is not enabled by default, so it must be
-   enabled in ``local.conf`` before running ``stack.sh``. This example ``local.conf``
+      $ cd devstack
+      $ touch localrc
+
+4. The Mistral service is not enabled by default, so it must be enabled in ``localrc``
+   before running ``stack.sh``. This example of ``localrc``
    file shows all of the settings required for Mistral::
 
       # Enable Mistral
@@ -21,3 +30,9 @@
 5. Deploy your OpenStack Cloud with Mistral::
 
    $ ./stack.sh
+
+
+Note: 
+1. All needed Mistral keystone endpoints will be automatically created
+during installation.
+2. Python-mistralclient also will be automatically cloned and installed.