diff --git a/doc/source/index.rst b/doc/source/index.rst
index aeb2f268b..243c94979 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -16,7 +16,7 @@ such as TryStack, HP, or Rackspace, in order to use the nova client.
     to get an idea of the concepts. By understanding the concepts
     this library should make more sense.
 
-    __ https://developer.openstack.org/api-guide/compute/index.html
+    __ https://docs.openstack.org/api-guide/compute/index.html
 
 .. toctree::
    :maxdepth: 2
diff --git a/novaclient/v2/servers.py b/novaclient/v2/servers.py
index f9f176d2c..43ed34f22 100644
--- a/novaclient/v2/servers.py
+++ b/novaclient/v2/servers.py
@@ -846,7 +846,7 @@ class ServerManager(base.BootingManagerWithFind):
             match the search_opts (optional). The search opts format is a
             dictionary of key / value pairs that will be appended to the query
             string.  For a complete list of keys see:
-            https://developer.openstack.org/api-ref/compute/#list-servers
+            https://docs.openstack.org/api-ref/compute/#list-servers
         :param marker: Begin returning servers that appear later in the server
                        list than that represented by this server id (optional).
         :param limit: Maximum number of servers to return (optional).