diff --git a/README.md b/README.md
index dc5477c..864670d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ privacy-preserving, proactive content negotiation with an explicit third-party
 delegation mechanism:
 
 * Proactive content negotiation at the HTTP layer (defined in the
-  [IETF I-D](https://httpwg.org/http-extensions/client-hints.html))
+  [IETF RFC](https://tools.ietf.org/html/rfc8942))
   enables servers to request delivery of specific hints, in order to enable
   optimized and automated selection of resources based on a user's device,
   conditions and preferences, and lets clients decide which hint requests they
diff --git a/index.bs b/index.bs
index 51fda2c..8941928 100644
--- a/index.bs
+++ b/index.bs
@@ -29,15 +29,6 @@ spec:fetch; type:dfn; text:client
         "href": "https://w3c.github.io/webappsec-permissions-policy/",
         "publisher": "W3C",
         "title": "Permissions Policy"
-    },
-    "CLIENT-HINTS": {
-        "authors": [
-            "Ilya Grigorik",
-            "Yoav Weiss"
-          ],
-          "href": "https://httpwg.org/http-extensions/client-hints.html",
-          "publisher": "IETF HTTP-WG",
-          "title": "Client Hints"
     }
 }
 
@@ -83,7 +74,7 @@ Infrastructure definition {#definition}
 The specification of the Client Hints **infrastructure** is divided between the
 following specifications and proposals:
 
-* IETF [[!CLIENT-HINTS]]
+* IETF [[!RFC8942]]
      - Provides the motivation for Client Hints.
      - Defines the fundamental Client Hints infrastructure:
         - The `Accept-CH` response header, which servers may use to advertise
@@ -240,10 +231,9 @@ if <var>request</var>'s <a for=request>header list</a>
   <li><p>If <var>request</var> is a <a>subresource request</a> and the result of running
    <a href="https://w3c.github.io/webappsec-permissions-policy/#algo-should-request-be-allowed-to-use-feature">Should request be allowed to use feature?</a>,
    given <var>request</var> and <var>hintName</var>’s
-   <a href="http://httpwg.org/http-extensions/client-hints.html#opt-in-via-feature-policy">associated
-   policy-controlled feature</a>, returns <code>false</code>, then skip the next steps and
-   continue to the next <var>hintName</var>.
-   [[!PERMISSIONS-POLICY]] [[!CLIENT-HINTS]]
+   <a href="#policy-controlled-features">associated policy-controlled feature</a>, returns
+   <code>false</code>, then skip the next steps and continue to the next <var>hintName</var>.
+   [[!PERMISSIONS-POLICY]]
   <li><p>If <var>request</var>'s <a for=request>header list</a> <a for="header list">does not
   contain</a> <var>hintName</var>, a user agent should <a for="header list">append</a>
   <var>hintName</var>/<var>value</var> to <var>request</var>'s <a for=request>header list</a>.
@@ -262,10 +252,10 @@ When asked to <dfn abstract-op>remove client hints from redirect if needed</dfn>
   <var>hintName</var> and if the result of running <a
   href="https://w3c.github.io/webappsec-permissions-policy/#algo-should-request-be-allowed-to-use-feature">Should
   request be allowed to use feature?</a>, given <var>request</var> and <var>hintName</var>’s
-  <a href="http://httpwg.org/http-extensions/client-hints.html#opt-in-via-feature-policy">associated
+  <a href="#policy-controlled-features">associated
   policy-controlled feature</a>, returns <code>false</code>, then remove <var>hintName</var> from
   <a for=request>header list</a>.
-  [[!PERMISSIONS-POLICY]] [[!CLIENT-HINTS]]
+  [[!PERMISSIONS-POLICY]]
  </ol>
 </ol>
 
@@ -391,7 +381,7 @@ Issue: Links for image features are broken, need to actually define that and lin
 
 Security and Privacy considerations {#privacy}
 ===========
-See [[!CLIENT-HINTS]].
+See [[!RFC8942]].
 
 Terms {#terms}
 ====