diff --git a/index.bs b/index.bs
index c270ab51..749cccfe 100644
--- a/index.bs
+++ b/index.bs
@@ -29,6 +29,23 @@ spec:reporting; urlPrefix: https://w3c.github.io/reporting/
   type: dfn
     text: report type
     text: visible to reportingobservers
+spec: HEADER-STRUCTURE; urlPrefix: https://httpwg.org/http-extensions/draft-ietf-httpbis-header-structure.html#
+  type: dfn
+    text: sh-dictionary; url: dictionary
+</pre>
+<pre class="biblio">
+{
+  "HEADER-STRUCTURE": {
+    "authors": [
+      "Mark Nottingham",
+      "Poul-Henning Kamp"
+    ],
+    "href": "https://tools.ietf.org/html/draft-ietf-httpbis-header-structure-18",
+    "title": "Structured Field Values for HTTP",
+    "status": "Draft",
+    "publisher": "IETF"
+  }
+}
 </pre>
 <style>
   .unstable::before {
@@ -80,10 +97,10 @@ spec:reporting; urlPrefix: https://w3c.github.io/reporting/
     within their application. It can do so by delivering the following HTTP
     response header to define a permissions policy:</p>
     <pre>
-      <a http-header>Permissions-Policy</a>: fullscreen 'none'; geolocation 'none'</pre>
-    <p>By specifying the "<code>'none'</code>"keyword for the origin list, the
-    specified features will be disabled for all browsing contexts, regardless of
-    their origin.</p>
+      <a http-header>Permissions-Policy</a>: fullscreen=(), geolocation=()</pre>
+    <p>By specifying an empty origin list, the specified features will be
+    disabled for all documents, including nested documents, regardless of their
+    origin.</p>
   </div>
   <div class="example">
     <p>Geolocation is disabled by default in all cross-origin frames. FastCorp
@@ -102,9 +119,9 @@ spec:reporting; urlPrefix: https://w3c.github.io/reporting/
     this by delivering the following HTTP response header to define a restricted
     permissions policy for Geolocation:</p>
     <pre>
-      <a http-header>Permissions-Policy</a>: geolocation 'self' https://example.com</pre>
+      <a http-header>Permissions-Policy</a>: geolocation=(self "https://example.com")</pre>
     <p>The <a>allowlist</a> is a list of one or more origins, which can include
-    the application's origin, optionally with the keyword "<code>'self'</code>",
+    the application's origin, optionally with the keyword "<code>self</code>",
     and any third-party origin.</p>
     <p>With this policy in effect, it can then use the "<code>allow</code>"
     iframe attribute as usual to grant geolocation to certain frames, but only
@@ -252,7 +269,8 @@ spec:reporting; urlPrefix: https://w3c.github.io/reporting/
     <p>A <dfn data-lt="policy directive|policy directives">policy
     directive</dfn> is an ordered map, mapping <a>policy-controlled features</a>
     to corresponding <a>allowlists</a> of origins.</p>
-    <p>A <a>policy directive</a> is represented in HTTP headers and HTML
+    <p>A <a>policy directive</a> is represented in HTTP headers as the
+    serialization of an <a>sh-dictionary</a> structure, and in and HTML
     attributes as its ASCII serialization.</p>
   </section>
   <section>
@@ -313,9 +331,9 @@ spec:reporting; urlPrefix: https://w3c.github.io/reporting/
 <section>
   <h2 id="serialization">Permissions Policy Serialization</h2>
   <section>
-    <h3 id="ascii-serialization">ASCII serialization</h3>
-    <p><a>Policy Directives</a> are represented in HTTP headers and in HTML
-    attributes as ASCII text.</p>
+    <h3 id="ascii-serialization">HTML attribute serialization</h3>
+    <p><a>Policy Directives</a> in HTML attributes are represented as their
+    ASCII serialization, with the following ABNF:
     <pre class="abnf">
       <dfn>serialized-permissions-policy</dfn> = <a>serialized-policy-directive</a> *(";" <a>serialized-policy-directive</a>)
       <dfn>serialized-policy-directive</dfn> = <a>feature-identifier</a> RWS <a>allow-list</a>
@@ -334,6 +352,29 @@ spec:reporting; urlPrefix: https://w3c.github.io/reporting/
       which contains the permissions policy.
     </div>
   </section>
+  <section>
+    <h3 id="structured-header-serialization">Structured header serialization</h3>
+    <a>Policy Directives</a> in HTTP headers are represented as Structured
+    Fields. [[!HEADER-STRUCTURE]]
+
+    In this representation, a <a>policy directive</a> is represented by a
+    Dictionary.
+
+    Each Dictionary Member associates a <a>feature</a> with an <a>allowlist</a>.
+    The Member Names must be Tokens. If a token does not name a supported
+    feature, then the Dictionary Member will be ignored by the processing steps.
+
+    The Member Values represent <a>allowlists</a>, and must be one of:
+    * a String containing the ASCII <a>serialization of an origin</a>
+    * the Token `*`
+    * the Token `self`
+    * an Inner List containing zero or more of the above items.
+
+    Any other items inside of an Inner List will be ignored by the processing
+    steps, and the Member Value will be processed as if they were not present.
+    Member Values of any other form will cause the entire Dictionary Member to
+    be ignored by the processing steps.
+  </section>
 </section>
 <section>
   <h2 id="delivery">Delivery</h2>
@@ -345,11 +386,15 @@ spec:reporting; urlPrefix: https://w3c.github.io/reporting/
     HTTP header field can be used in the [=response=] (server to client) to
     communicate the <a>permissions policy</a> that should be enforced by the
     client.</p>
-    <p>The header's value is the <a href="#ascii-serialization"></a> of one or
-    more <a>policy directive</a>s:.</p>
+    <p><a>Permissions-Policy</a> is a structured header. Its value must be a
+    dictionary. It's ABNF is:
     <pre class="abnf">
-      PermissionsPolicy = <a>serialized-permissions-policy</a> *("," <a>serialized-permissions-policy</a>)
+      PermissionsPolicy = <a>sh-dictionary</a>
     </pre>
+    The semantics of the dictionary are defined in
+    [[#structured-header-serialization]].
+
+    The processing steps are defined in [[#algo-construct-policy]].
   </section>
   <section>
     <h3 id="iframe-allow-attribute">The <code>allow</code> attribute of the
@@ -724,33 +769,45 @@ partial interface HTMLIFrameElement {
     Given a [=response=] (|response|) and an [=origin=] (|origin|), this
     algorithm returns a <a>declared permissions policy</a>.
 
-    1. Abort these steps if |response|’s <a for="response">header list</a> does
-      not contain a [=header=] whose [=name=] is
-      "<code>Permissions-Policy</code>".
-    1. Let |header| be the concatenation of the [=value=]s of all [=header=]
-      fields in |response|’s <a for="response">header list</a> whose name is
-      "<code>Permissions-Policy</code>", separated by U+002C (,) (according to
-      [RFC7230, 3.2.2]).
-    1. Let |policy| be the result of executing <a>Parse header from value and
-      origin</a> on |header| and |origin|.
+    1. Let |parsed header| be the result of executing <a>get a structured
+      header</a> given "<code>Permissions-Policy</code>" and "dictionary" from
+      |response|’s header list.
+    1. If |parsed header| is null or failure, abort these steps.
+    1. Let |policy| be the result of executing <a>Construct policy from
+      dictionary and origin</a> on |parsed header| and |origin|.
     1. Return |policy|.
 
     </div>
   </section>
   <section>
-    ## <dfn>Parse header from value and origin</dfn> ## {#algo-parse-header}
+    ## <dfn>Construct policy from dictionary and origin</dfn> ## {#algo-construct-policy}
 
-    <div class="algorithm" data-algorithm="parse-header">
-    Given a string (|value|) and an [=origin=] (|origin|), this algorithm will
-    return a <a>declared permissions policy</a>.
+    <div class="algorithm" data-algorithm="construct-policy">
+    Given an <a>ordered map</a> (|dictionary|) and an [=origin=] (|origin|), this
+    algorithm will return a <a>declared permissions policy</a>.
     1. Let |policy| be an empty ordered map.
-    1. For each |element| returned by <a lt="split on commas">splitting |value|
-      on commas</a>:
-        1. Let |directive| be the result of executing <a
-          href="#algo-parse-policy-directive"></a> on |element| with <var
-          ignore>container origin</var> set to |origin|.
-        1. Run <a>Merge directive with declared policy</a> on |directive| and
-          |policy|.
+    1. For each |feature-name| → |value| of |dictionary|:
+        1. If |feature-name| does not identify any recognized
+          <a>policy-controlled feature</a>, then continue.
+        1. Let |feature| be the <a>policy-controlled feature</a> identified by
+          |feature-name|.
+        1. Let |allowlist| be a new <a>allowlist</a>.
+        1. If |value| is the token `*`, or if |value| is a list which contains
+          the token `*`, set |allowlist| to <a>the special value
+          <code>*</code></a>.
+        1. Otherwise:
+            1. Set |allowlist| to an new <a>ordered set</a>.
+            1. If |value| is the token `self`, append |origin| to |allowlist|.
+            1. If |value| is a list, then for each |element| in |value|:
+                1. If |element| is the token `self`, append |origin| to
+                  |allowlist|.
+                1. Otherwise, let |result| be the result of executing the <a>URL
+                  parser</a> on |element|.
+                1. If |result| is not failure:
+                    1. Let |target| be the origin of |result|.
+                    1. If |target| is not an opaque origin, append |target| to
+                      |allowlist|.
+        1. Set |policy|[|feature|] to |allowlist|.
     1. Return |policy|.
 
     </div>
@@ -800,19 +857,6 @@ partial interface HTMLIFrameElement {
 
     </div>
   </section>
-  <section>
-    ## <dfn>Merge directive with declared policy</dfn> ## {#algo-merge-directive-with-declared-policy}
-
-    <div class="algorithm"
-    data-algorithm="merge-directive-with-declared-policy">
-    Given a policy directive (|directive|) and a declared policy (|policy|),
-    this algorithm will modify |policy| to account for the new directive.
-    1. For each |feature| → |allowlist| of |directive|:
-        1. If |policy| does not contain an allowlist for |feature|, then set
-          |policy|[|feature|] to |allowlist|.
-
-    </div>
-  </section>
   <section>
     ## <dfn>Process permissions policy attributes</dfn> ## {#algo-process-policy-attributes}