diff --git a/doc/source/man/heat-db-setup.rst b/doc/source/man/heat-db-setup.rst
index 3590b6b8d..44aaae86c 100644
--- a/doc/source/man/heat-db-setup.rst
+++ b/doc/source/man/heat-db-setup.rst
@@ -60,4 +60,4 @@ EXAMPLES
 
 BUGS
 ====
-Heat bugs are managed through Launchpad <https://launchpad.net/heat>
+Heat bugs are managed through Launchpad `OpenStack Heat Bugs <https://bugs.launchpad.net/heat>`__
diff --git a/doc/source/man/heat-keystone-setup.rst b/doc/source/man/heat-keystone-setup.rst
index 23637c669..cc5a3e054 100644
--- a/doc/source/man/heat-keystone-setup.rst
+++ b/doc/source/man/heat-keystone-setup.rst
@@ -15,7 +15,7 @@ DESCRIPTION
 ===========
 The heat-keystone-setup tool configures keystone for use with Heat. This script requires admin keystone credentials to be available in the shell environment and write access to /etc/keystone.
 
-Distributions may provide other tools to setup keystone for use with Heat, so check the distro documenation first.
+Distributions may provide other tools to setup keystone for use with Heat, so check the distro documentation first.
 
 EXAMPLES
 ========
@@ -24,4 +24,4 @@ EXAMPLES
 
 BUGS
 ====
-Heat bugs are managed through Launchpad <https://launchpad.net/heat>
+Heat bugs are managed through Launchpad `OpenStack Heat Bugs <https://bugs.launchpad.net/heat>`__