diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..49b22be
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/devstack-plugin-amqp1.git
diff --git a/README.md b/README.md
deleted file mode 100644
index 5b4bb81..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# amqp1-devstack
-Devstack plugin for AMQP 1.0 olso.messaging driver
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..0750d80
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,15 @@
+======================
+ Enabling in Devstack
+======================
+
+Devstack plugin for AMQP 1.0 olso.messaging driver
+
+1. Download DevStack
+
+2. Add this repo as an external repository::
+
+     cat > local.conf
+     [[local|localrc]]
+     enable_plugin amqp1 https://git.openstack.org/openstack/devstack-plugin-amqp1
+
+3. run ``stack.sh``
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 41ebb7e..f3357e3 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -204,8 +204,8 @@ function _iniset_qpid_backend {
     # @TODO(kgiusti) why is "qpid_" part of the setting's name?  Why isn't this generic??
     iniset $file $section qpid_hostname ${AMQP1_HOST}
     if [ -n "$AMQP1_USERNAME" ]; then
-	iniset $file $section qpid_username $AMQP1_USERNAME
-	iniset $file $section qpid_password $AMQP1_PASSWORD
+        iniset $file $section qpid_username $AMQP1_USERNAME
+        iniset $file $section qpid_password $AMQP1_PASSWORD
     fi
 }
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..20ecbaa
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,25 @@
+[tox]
+minversion = 1.6
+skipsdist = True
+envlist = bashate
+
+[testenv]
+usedevelop = False
+install_command = pip install {opts} {packages}
+
+[testenv:bashate]
+deps = bashate
+whitelist_externals = bash
+commands = bash -c "find {toxinidir}          \
+         -not \( -type d -name .?\* -prune \) \ # prune all 'dot' dirs
+         -not \( -type d -name doc -prune \)  \ # skip documentation
+         -type f                              \ # only files
+         -not -name \*~                       \ # skip editors, readme, etc
+         -not -name \*.md                     \
+         \(                                   \
+          -name \*.sh -or                     \
+          -name \*rc -or                      \
+          -name functions\* -or               \
+          -wholename \*/lib/\*                \ # /lib files are shell, but
+         \)                                   \ #   have no extension
+         -print0 | xargs -0 bashate -v"