diff --git a/devstack/README.rst b/devstack/README.rst
new file mode 100644
index 00000000..de2b1f40
--- /dev/null
+++ b/devstack/README.rst
@@ -0,0 +1,15 @@
+=========================
+Enabling Aodh in DevStack
+=========================
+
+1. Download DevStack::
+
+   git clone https://git.openstack.org/openstack-dev/devstack.git
+   cd devstack
+
+2. Add this repo as an external repository in ``local.conf`` file::
+
+   [[local|localrc]]
+   enable_plugin aodh https://git.openstack.org/openstack/aodh
+
+3. Run ``stack.sh``.
diff --git a/doc/source/install/development.rst b/doc/source/install/development.rst
index bb054bf2..d425469c 100644
--- a/doc/source/install/development.rst
+++ b/doc/source/install/development.rst
@@ -52,4 +52,4 @@ Configuring devstack
    The first group of daemons are necessary for core aodh functionality:
    polling, event listening, and data collection.
 
-.. _devstack: http://www.devstack.org/
+.. _devstack: http://docs.openstack.org/developer/devstack
diff --git a/rally-jobs/README.rst b/rally-jobs/README.rst
index 533c6cf1..9dc7d319 100644
--- a/rally-jobs/README.rst
+++ b/rally-jobs/README.rst
@@ -22,8 +22,8 @@ Useful links
 
 * More about Rally: https://rally.readthedocs.org/en/latest/
 
-* How to add rally-gates: https://rally.readthedocs.org/en/latest/rally_gatejob.html
+* How to add rally-gates: https://rally.readthedocs.org/en/latest/gates.html
 
 * About plugins:  https://rally.readthedocs.org/en/latest/plugins.html
 
-* Plugin samples: https://github.com/stackforge/rally/tree/master/doc/samples/plugins
+* Plugin samples: https://github.com/openstack/rally/tree/master/samples/plugins