diff --git a/reference/licensing.rst b/reference/licensing.rst
index 7f070526e..33382b7c3 100644
--- a/reference/licensing.rst
+++ b/reference/licensing.rst
@@ -7,17 +7,15 @@ to licensing.
 
 The project must be licensed under `Apache License, Version 2.0`_ (ASLv2).
 
-.. _Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+.. _Apache License, Version 2.0: https://www.apache.org/licenses/LICENSE-2.0
 
-**OpenStack projects and libraries** (produced by official OpenStack project
-teams) should generally be licensed under ASLv2, and otherwise must be
-licensed under a license supported by the `Contributor License
-Agreement`_ (CLA) which allows redistribution by the OpenStack
-Foundation under ASLv2 (currently only the MIT and both forms of the
-BSD license meet this requirement). In particular, service projects
-are recommended to *always* pick ASLv2.
-
-.. _Contributor License Agreement: https://docs.openstack.org/contributors/common/setup-gerrit.html#individual-contributor-license-agreement
+**OpenStack projects and libraries** (produced by official OpenStack
+project teams) should generally be licensed under the Apache License,
+Version 2.0 (ASLv2), or under a license that is both compatible with
+ASLv2 and allows redistribution or sublicensing under ASLv2 terms.
+Currently, only the MIT license and the BSD 2-Clause and 3-Clause
+licenses meet this requirement. In particular, service projects are
+strongly recommended to use ASLv2 as their license.
 
 In order to be acceptable as dependencies of OpenStack projects,
 **external libraries** (produced and published by 3rd-party developers)
@@ -31,7 +29,7 @@ into a gray area - they are not presumed to be compatible or incompatible and
 instead are reviewed on a case by case basis. Please use the `legal-discuss`_
 mailing list to bring up any such cases.
 
-.. _legal-discuss: http://lists.openstack.org/cgi-bin/mailman/listinfo/legal-discuss
+.. _legal-discuss: https://lists.openstack.org/mailman3/lists/legal-discuss.lists.openstack.org/
 
 **Projects run as part of the OpenStack Infrastructure** (in order to
 *produce* OpenStack software) may be licensed under any `OSI-approved license`_.
@@ -40,8 +38,8 @@ This includes tools that are run with or on OpenStack projects only
 during validation or testing phases of development (e.g., a source
 code linter).
 
-.. _OSI-approved license: http://opensource.org/licenses/alphabetical
+.. _OSI-approved license: https://opensource.org/license
 
 Other licenses (not explicitly listed in this document) may be considered
 in the future on a case-by-case basis by the Technical Committee, with the
-help of the OpenStack Foundation legal counsel.
+help of the OpenInfra Foundation legal counsel.