diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 52c51deef..c299c701f 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,4 +1,4 @@
 Please see the Neutron CONTRIBUTING.rst file for how to contribute to
 neutron-vpnaas:
 
-`Neutron CONTRIBUTING.rst <http://git.openstack.org/cgit/openstack/neutron/tree/CONTRIBUTING.rst>`_
+`Neutron CONTRIBUTING.rst <https://git.openstack.org/cgit/openstack/neutron/tree/CONTRIBUTING.rst>`_
diff --git a/HACKING.rst b/HACKING.rst
index 6f94c82d3..e75f9be3d 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -4,4 +4,4 @@ Neutron VPNaaS Style Commandments
 Please see the Neutron HACKING.rst file for style commandments for
 neutron-vpnaas:
 
-`Neutron HACKING.rst <http://git.openstack.org/cgit/openstack/neutron/tree/HACKING.rst>`_
+`Neutron HACKING.rst <https://git.openstack.org/cgit/openstack/neutron/tree/HACKING.rst>`_
diff --git a/README.rst b/README.rst
index 4bfc09d85..57ebbb736 100644
--- a/README.rst
+++ b/README.rst
@@ -8,12 +8,12 @@ requires Neutron to run.
 External Resources:
 ===================
 
-The homepage for Neutron is: http://launchpad.net/neutron.  Use this
+The homepage for Neutron is: https://launchpad.net/neutron.  Use this
 site for asking for help, and filing bugs. We use a single Launchpad
 page for all Neutron projects.
 
 Code is available on git.openstack.org at:
-<http://git.openstack.org/cgit/openstack/neutron-vpnaas.
+https://git.openstack.org/cgit/openstack/neutron-vpnaas.
 
 Please refer to Neutron documentation for more information:
-`Neutron README.rst <http://git.openstack.org/cgit/openstack/neutron/tree/README.rst>`_
+`Neutron README.rst <https://git.openstack.org/cgit/openstack/neutron/tree/README.rst>`_
diff --git a/TESTING.rst b/TESTING.rst
index 9df8dc22f..c6f46478a 100644
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -5,4 +5,4 @@ Please see the TESTING.rst file for the Neutron project itself. This will have
 the latest up to date instructions for how to test Neutron, and will
 be applicable to neutron-vpnaas as well:
 
-`Neutron TESTING.rst <http://git.openstack.org/cgit/openstack/neutron/tree/TESTING.rst>`_
+`Neutron TESTING.rst <https://git.openstack.org/cgit/openstack/neutron/tree/TESTING.rst>`_
diff --git a/doc/source/devref/vpnaas-tempest-test.rst b/doc/source/devref/vpnaas-tempest-test.rst
index d40c676a6..bd797016a 100644
--- a/doc/source/devref/vpnaas-tempest-test.rst
+++ b/doc/source/devref/vpnaas-tempest-test.rst
@@ -65,4 +65,4 @@ The actual raw command in gate running under the tempest code directory is:
 External Resources:
 ===================
 
-For more information on the tempest, see: <http://docs.openstack.org/developer/tempest/>
+For more information on the tempest, see: <https://docs.openstack.org/developer/tempest/>
diff --git a/doc/source/index.rst b/doc/source/index.rst
index aeced4d3b..a168bf5ed 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -22,7 +22,7 @@ Maintained as a separate repo, this works in conjunction with the Neutron repo t
 provide VPN services for OpenStack. The `VPNaaS API`_ is implementation as an
 extension to Neutron's networking API:
 
-.. _`VPNaaS API`: http://developer.openstack.org/api-ref-networking-v2-ext.html#vpnaas-v2.0
+.. _`VPNaaS API`: https://developer.openstack.org/api-ref/networking/v2/index.html#vpnaas-2-0-unmaintained-vpn-vpnservices-ikepolicies-ipsecpolicies-endpoint-groups-ipsec-site-connections
 
 This documentation is generated by the Sphinx toolkit and lives in the source
 tree.  Additional documentation on VPNaaS and other components of OpenStack
@@ -30,9 +30,9 @@ can be found on the `OpenStack wiki`_ and the `Neutron section of the wiki`_ (se
 the VPN related pages).
 The `Neutron Development wiki`_ is also a good resource for new contributors.
 
-.. _`OpenStack wiki`: http://wiki.openstack.org
-.. _`Neutron section of the wiki`: http://wiki.openstack.org/Neutron
-.. _`Neutron Development wiki`: http://wiki.openstack.org/NeutronDevelopment
+.. _`OpenStack wiki`: https://wiki.openstack.org/wiki/Main_Page
+.. _`Neutron section of the wiki`: https://wiki.openstack.org/wiki/Neutron
+.. _`Neutron Development wiki`: https://wiki.openstack.org/wiki/NeutronDevelopment
 
 Enjoy!
 
@@ -47,4 +47,4 @@ Developer Docs
 API Extensions
 ==============
 
-Go to http://api.openstack.org for information about OpenStack Network API extensions.
+Go to https://developer.openstack.org/api-ref/networking/ for information about OpenStack Network API extensions.
diff --git a/setup.cfg b/setup.cfg
index b88ccb5b0..5f7b10b96 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ description-file =
     README.rst
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = http://www.openstack.org/
+home-page = https://www.openstack.org/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology