diff --git a/_data/irc_versions.yml b/_data/irc_versions.yml
index 392d83f..442f5a5 100644
--- a/_data/irc_versions.yml
+++ b/_data/irc_versions.yml
@@ -204,7 +204,15 @@ stable:
       link: /specs/extensions/whox.html
       isupport:
         - WHOX
-      
+
+    channel-context-client-tag:
+      name: +channel-context
+      description: Channel context client tag
+      link: /specs/client-tags/channel-context.html
+      hide-if-no-support: true
+      tags:
+        - +channel-context
+
     reply-client-tag:
       name: +reply
       description: Reply client tag
@@ -307,14 +315,6 @@ stable:
       caps:
         - draft/read-marker
 
-    channel-context-client-tag:
-      name: +draft/channel-context
-      description: Channel context client tag DRAFT
-      link: /specs/client-tags/channel-context.html
-      draft: true
-      tags:
-        - +draft/channel-context
-
     react-client-tag:
       name: +draft/react
       description: React and unreact client tags DRAFT
diff --git a/_data/sw_clients.yml b/_data/sw_clients.yml
index 8bac824..e5ed911 100644
--- a/_data/sw_clients.yml
+++ b/_data/sw_clients.yml
@@ -436,7 +436,6 @@
           cap-notify:
           cap-3.1:
           cap-3.2:
-          channel-context-client-tag:
           chathistory:
           echo-message:
           extended-monitor:
@@ -452,6 +451,9 @@
           standard-replies:
           typing-client-tag:
           whox:
+      partial:
+        stable:
+          channel-context-client-tag: "draft cap"
         SASL:
           plain:
     - name: Srain
@@ -581,7 +583,6 @@
           cap-notify:
           chghost:
           account-registration:
-          channel-context-client-tag:
           chathistory:
           echo-message:
           extended-join:
@@ -598,6 +599,9 @@
           server-time:
           setname:
           whox:
+      partial:
+        stable:
+          channel-context-client-tag: "draft cap"
         SASL:
           - plain
           - oauthbearer
@@ -615,7 +619,6 @@
           cap-3.1:
           cap-3.2:
           channel-rename:
-          channel-context-client-tag:
           chghost:
           echo-message:
           extended-join:
@@ -641,6 +644,9 @@
           react-client-tag:
           reply-client-tag:
           typing-client-tag:
+      partial:
+        stable:
+          channel-context-client-tag: "draft cap"
         SASL:
           - plain
           - scram-sha-256
@@ -1004,7 +1010,6 @@
           server-time:
           setname:
           whox:
-          channel-context-client-tag:
           react-client-tag:
           typing-client-tag:
           reply-client-tag:
@@ -1012,6 +1017,7 @@
           - plain
       partial:
         stable:
+          channel-context-client-tag: "draft cap"
           no-implicit-names: "draft cap"
 
 - name: Bouncers
@@ -1372,7 +1378,6 @@
           cap-3.1:
           cap-3.2:
           cap-notify:
-          channel-context-client-tag:
           chghost:
           echo-message:
           extended-join:
@@ -1401,6 +1406,7 @@
             - scram-sha-256
       partial:
         stable:
+          channel-context-client-tag: "draft cap"
           reply-client-tag: "draft cap"
     - name: Moon Moon
       # ref: https://github.com/wiseguiz/Moon-Moon/blob/master/irc.moon
diff --git a/docs/sasl-mechs.md b/docs/sasl-mechs.md
index cfcf2f6..1804ecd 100644
--- a/docs/sasl-mechs.md
+++ b/docs/sasl-mechs.md
@@ -8,6 +8,7 @@ page-header: >
 IRC SASL authentication primarily uses the same mechanisms as SASL in other protocols. Most commonly:
 
 * [PLAIN](https://tools.ietf.org/html/rfc4616) as defined by RFC 4616
+* [OAUTHBEARER](https://tools.ietf.org/html/rfc7628) as defined by RFC 7628
 * [EXTERNAL](https://tools.ietf.org/html/rfc4422#appendix-A) as defined by RFC 4422
 * [SCRAM-SHA-256](https://tools.ietf.org/html/rfc7677) as defined by RFC 7677
 
diff --git a/specs b/specs
index 42ade61..5eca32c 160000
--- a/specs
+++ b/specs
@@ -1 +1 @@
-Subproject commit 42ade61d4e49203a1c808203135efe6532845302
+Subproject commit 5eca32ce8cbc0c8f9d123529ef221d8da9516b65