diff --git a/README.rst b/README.rst
index d475a45..5980b93 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,13 @@
 Heat
 ====
 
-Heat is the main project in the OpenStack Orchestration program. It implements an orchestration engine to launch multiple composite cloud applications based on templates in the form of text files that can be treated like code. A native Heat template format is evolving, but Heat also endeavours to provide compatibility with the AWS CloudFormation template format, so that many existing CloudFormation templates can be launched on OpenStack. Heat provides both an OpenStack-native ReST API and a CloudFormation-compatible Query API. 
+Heat is the main project in the OpenStack Orchestration program. It implements
+an orchestration engine to launch multiple composite cloud applications based
+on templates in the form of text files that can be treated like code. A native
+Heat template format is evolving, but Heat also endeavours to provide
+compatibility with the AWS CloudFormation template format, so that many
+existing CloudFormation templates can be launched on OpenStack. Heat provides
+both an OpenStack-native ReST API and a CloudFormation-compatible Query API.
 
 Sample pillars
 ==============
@@ -125,16 +131,34 @@
 
     pip install git+https://github.com/Juniper/contrail-heat.git@R1.30
 
-Read more
-=========
-
-* http://docs.openstack.org/developer/heat/man/heat-keystone-setup.html
-* http://docwiki.cisco.com/wiki/OpenStack_Havana_Release:_High-Availability_Manual_Deployment_Guide
-
-
 Things to improve
 =================
 
 * IBM UrbanCode Deploy - has resources for AWS and VMWare
   http://www.ibm.com/developerworks/rational/library/multi-platform-application-deployment-urbancode-deploy/
 
+Documentation and Bugs
+============================
+
+To learn how to deploy OpenStack Salt, consult the documentation available
+online at:
+
+    https://wiki.openstack.org/wiki/OpenStackSalt
+
+In the unfortunate event that bugs are discovered, they should be reported to
+the appropriate bug tracker. If you obtained the software from a 3rd party
+operating system vendor, it is often wise to use their own bug tracker for
+reporting problems. In all other cases use the master OpenStack bug tracker,
+available at:
+
+    http://bugs.launchpad.net/openstack-salt
+
+Developers wishing to work on the OpenStack Salt project should always base
+their work on the latest formulas code, available from the master GIT
+repository at:
+
+    https://git.openstack.org/cgit/openstack/salt-formula-heat
+
+Developers should also join the discussion on the IRC list, at:
+
+    https://wiki.openstack.org/wiki/Meetings/openstack-salt
\ No newline at end of file