diff --git a/_data/irc_versions.yml b/_data/irc_versions.yml
index 7c3f2786..5abf3717 100644
--- a/_data/irc_versions.yml
+++ b/_data/irc_versions.yml
@@ -78,6 +78,12 @@ stable:
       link: /specs/extensions/extended-join.html
       caps:
         - extended-join
+    extended-monitor:
+      name: extended-monitor
+      description: Extended Monitor
+      link: /specs/extensions/extended-monitor.html
+      caps:
+        - extended-monitor
     invite-notify:
       name: invite-notify
       description: invite-notify Extension
@@ -213,14 +219,6 @@ stable:
       caps:
         - draft/channel-rename
 
-    extended-monitor:
-      name: draft/extended-monitor
-      description: Extended Monitor DRAFT
-      link: /specs/extensions/extended-monitor.html
-      draft: true
-      caps:
-        - extended-monitor
-
     multiline:
       name: draft/multiline
       description: Multiline messages DRAFT
diff --git a/_data/su_networks.yml b/_data/su_networks.yml
index 88e9b426..01d5d717 100644
--- a/_data/su_networks.yml
+++ b/_data/su_networks.yml
@@ -23,7 +23,6 @@
           chghost:
           echo-message:
           extended-join:
-          extended-monitor:
           invite-notify:
           labeled-response:
           message-tags:
@@ -42,6 +41,7 @@
       partial:
         stable:
           bot-mode: Draft
+          extended-monitor: Draft
     - name: InspIRCd Testnet
       ircd-ver: InspIRCd-3
       net-address:
@@ -126,7 +126,6 @@
           cap-notify:
           chghost:
           chathistory:
-          extended-monitor:
           echo-message:
           extended-join:
           invite-notify:
@@ -147,6 +146,7 @@
       partial:
         stable:
           bot-mode: Draft
+          extended-monitor: Draft
 
 - name: Networks
   note: >
@@ -413,7 +413,6 @@
           account-registration:
           channel-rename:
           chathistory:
-          extended-monitor:
           chghost:
           echo-message:
           extended-join:
@@ -435,3 +434,4 @@
       partial:
         stable:
           bot-mode: Draft
+          extended-monitor: Draft
diff --git a/_data/sw_clients.yml b/_data/sw_clients.yml
index 1ec3ca03..27cf81bb 100644
--- a/_data/sw_clients.yml
+++ b/_data/sw_clients.yml
@@ -466,9 +466,9 @@
           account-registration:
           channel-context-client-tag:
           chathistory:
-          extended-monitor:
           echo-message:
           extended-join:
+          extended-monitor: Git
           invite-notify:
           labeled-response:
           message-tags:
@@ -816,8 +816,8 @@
           cap-3.2:
           cap-notify:
           chathistory:
-          extended-monitor:
           echo-message:
+          extended-monitor: Git
           message-tags:
           monitor:
           multi-prefix:
@@ -980,9 +980,9 @@
           chathistory:
           chghost:
           event-playback:
-          extended-monitor:
           echo-message:
           extended-join:
+          extended-monitor: Git
           invite-notify:
           message-tags:
           monitor:
@@ -1015,8 +1015,8 @@
           cap-notify:
           chghost:
           echo-message:
-          extended-monitor:
           extended-join:
+          extended-monitor: Git
           invite-notify:
           labeled-response:
           message-tags:
diff --git a/_data/sw_servers.yml b/_data/sw_servers.yml
index 08c67b63..b99238eb 100644
--- a/_data/sw_servers.yml
+++ b/_data/sw_servers.yml
@@ -35,7 +35,7 @@
           chghost:
           echo-message:
           extended-join:
-          extended-monitor:
+          extended-monitor: Git
           invite-notify:
           labeled-response:
           message-tags:
@@ -223,9 +223,9 @@
           cap-notify:
           chghost:
           chathistory:
-          extended-monitor: 6.0+
           echo-message:
           extended-join:
+          extended-monitor: Git
           invite-notify: 6.0+
           labeled-response:
           message-tags:
diff --git a/_irc/index.md b/_irc/index.md
index 6c42f966..ebae0066 100644
--- a/_irc/index.md
+++ b/_irc/index.md
@@ -319,7 +319,7 @@ implementations.
 The [Monitor spec]({{site.baseurl}}/specs/extensions/monitor.html) details this
 command, the relevant `RPL_ISUPPORT` token and the commands used with it.
 
-The **work-in-progress** [Extended Monitor spec]({{site.baseurl}}/specs/extensions/extended-monitor.html)
+The [Extended Monitor spec]({{site.baseurl}}/specs/extensions/extended-monitor.html)
 builds upon the Monitor spec, and extends it to various events.
 
 
diff --git a/specs b/specs
index 20f525e5..8f0ca143 160000
--- a/specs
+++ b/specs
@@ -1 +1 @@
-Subproject commit 20f525e5925fc15e1971d3300f46b5982abab4fe
+Subproject commit 8f0ca1435aa1b537991a7fb266a6e73954561911