diff --git a/HACKING.rst b/HACKING.rst
index f15b05de6..39378cb38 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
 Style Commandments
 ==================
 
-Read the OpenStack Style Commandments https://docs.openstack.org/developer/hacking/
+Read the OpenStack Style Commandments https://docs.openstack.org/hacking/latest/
diff --git a/README.rst b/README.rst
index 4949f2063..6aafe772e 100644
--- a/README.rst
+++ b/README.rst
@@ -22,6 +22,6 @@ The Oslo messaging API supports RPC and notifications over a number of
 different messaging transports.
 
 * License: Apache License, Version 2.0
-* Documentation: https://docs.openstack.org/oslo.messaging/latest
+* Documentation: https://docs.openstack.org/oslo.messaging/latest/
 * Source: https://git.openstack.org/cgit/openstack/oslo.messaging
 * Bugs: https://bugs.launchpad.net/oslo.messaging
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index 19f73d207..c001ae4c8 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -729,8 +729,8 @@ class Connection(object):
         if self._initial_pid != current_pid:
             LOG.warning(_LW("Process forked after connection established! "
                             "This can result in unpredictable behavior. "
-                            "See: http://docs.openstack.org/developer/"
-                            "oslo.messaging/transport.html"))
+                            "See: https://docs.openstack.org/oslo.messaging/"
+                            "latest/reference/transport.html"))
             self._initial_pid = current_pid
 
         if retry is None:
diff --git a/oslo_messaging/_i18n.py b/oslo_messaging/_i18n.py
index cc3835c00..848ca3bd9 100644
--- a/oslo_messaging/_i18n.py
+++ b/oslo_messaging/_i18n.py
@@ -12,7 +12,7 @@
 
 """oslo.i18n integration module.
 
-See http://docs.openstack.org/developer/oslo.i18n/usage.html
+See https://docs.openstack.org/oslo.i18n/latest/user/index.html
 
 """
 
diff --git a/setup.cfg b/setup.cfg
index 2855ff2e7..51b1b7caa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ author-email = openstack-dev@lists.openstack.org
 summary = Oslo Messaging API
 description-file =
     README.rst
-home-page = http://docs.openstack.org/developer/oslo.messaging/
+home-page = https://docs.openstack.org/oslo.messaging/latest/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers