Index: internal/hats.xml
===================================================================
--- internal/hats.xml
+++ internal/hats.xml
@@ -24,38 +24,50 @@
   <p>The current set of core-appointed hats is core secretary, head
     release engineer, the security officer, and postmaster.</p>
 
-  <p>It is suggested that shortened terms longer than half of a core
-    term be considered a full term for purposes of eligibility.</p>
+  <p>The FreeBSD Core team has approved the following hats term limits
+    policy.  This was first posted to the Developers mailing list on
+    June 22, 2012, and amended in June 2015.</p>
 
-  <p>This policy will begin with the start of the next core term, and
-    all hats will start off with zero terms at that time.</p>
+  <h2>Policy</h2>
 
-  <p>The FreeBSD Core team approved the following hats term limits
-    policy which was posted to the Developers mailing list on June 22,
-    2012.</p>
+  <p>An individual may serve as a core-appointed hat given that:</p>
 
-  <h2>Policy</h2>
+  <ul>
+    <li>Core approves their appointment or re-appointment to the role.</li>
+    <li>The individual is willing to continue.</li>
+    <li>The individual is still able to perform the role effectively.</li>
+  </ul>
+
+  <p>Hats are appointed at the pleasure of core.  Appointments may be
+    rescinded by core at any time where this serves the needs of the
+    project.</p>
+
+  <p>Each hat's term begins three months after the start of a core
+    team's two year term and ends three months after the end of the core
+    team's term.  Hats are explicitly approved by the new core team at
+    the start of the hat's term.</p>
 
-  <p>An individual may serve as a core-appointed hat for at most two
-    consecutive terms.  Each hat's term begins three months after the
-    start of a core team's term and ends three months after the end of
-    a core team's term.  Hats are explicitly approved by the new core
-    team at the start of a hat's term.  An individual who serves as a
-    hat for two consecutive terms may serve again after a break of at
-    least one full term.</p>
+  <p>If a hat becomes vacant during a term, core shall appoint a
+    replacement for the remainder of the term.</p>
 
   <p>Core shall review all hats annually.</p>
 
-  <p>If a hat becomes vacant during a term, core shall appoint a
-    replacement for the remainder of the term.  It is at core's
-    discretion whether the shortened term will count for purposes of
-    limiting the terms of the replacement.</p>
+  <p>In general it is expected that volunteers serving in hat
+    positions will be limited to serving for four consecutive years,
+    rounded up to the first natural review/appointment cycle.</p>
+
+  <p>Non volunteers serving in hat positions are still expected to
+    participate in annual reviews and provide for continuity to core's
+    satisfaction.</p>
+
+  <p>Each hat must appoint a deputy who can cover their role in the
+    case of absence or illness, and be trained and ready to take over
+    the role (subject to core approval) should the role holder resign
+    before the end of their term.</p>
 
   <p>If a core team is dissolved prematurely, then the next term for
     each hat will begin three months after the new core team's term
-    begins.  It is at the new core's discretion whether the shortened
-    term will count for purposes of limiting the terms of current
-    hats.</p>
+    begins.</p>
 
   <p>These limits apply to individual hats and not to teams.  For
     teams with a single lead role, the limits shall apply to the lead