diff --git a/docs/server/messages/opertype.yml b/docs/server/messages/opertype.yml
index 6ec9d271..4b0d8575 100644
--- a/docs/server/messages/opertype.yml
+++ b/docs/server/messages/opertype.yml
@@ -1,5 +1,20 @@
 name: OPERTYPE
 source: uid
+tags:
+  ~automatic: |-
+    [**1206+**] If present then the source user was automatically logged into their server operator account.
+  ~name: |-
+    [**1206+**] The name of the operator account the source user logged into.
+  ~chanmodes: |-
+    [**1206+**] The server operator-only channel modes that the source user has access to (including modes that may not currently exist).
+  ~usermodes: |-
+    [**1206+**] The server operator-only user modes that the source user has access to (including modes that may not currently exist).
+  ~commands: |-
+    [**1206+**] A token list of the server operator-only commands that the source user has access to.
+  ~privileges: |-
+    [**1206+**] A token list of the server operator-only privileges that the source user has.
+  ~snomasks: |-
+    [**1206+**] The server notice masks that the source user has access to (including snomasks that may not currently exist).
 syntax:
   fields:
     type: The new server operator type of the source user.
diff --git a/mkdocs_inspircd/templates/servermsg.md.j2 b/mkdocs_inspircd/templates/servermsg.md.j2
index 424d5541..6de39b13 100644
--- a/mkdocs_inspircd/templates/servermsg.md.j2
+++ b/mkdocs_inspircd/templates/servermsg.md.j2
@@ -25,10 +25,15 @@ Fully connected         | {% if "connected" in phase %}✔️{% else %}❌{% end
 
 ### Syntax
 
+{% set prefix = "" %}
+{% if tags is defined %}
+{% set prefix = "[@<tags>] " %}
+{% endif %}
+
 {% if source is defined %}
-{% set prefix = ":<" ~ source ~ ">" %}
+{% set prefix = prefix ~ ":<" ~ source ~ ">" %}
 {% else %}
-{% set prefix = "[:<sid>]" %}
+{% set prefix = prefix ~ "[:<sid>]" %}
 {% endif %}
 
 {% if syntax is not defined %}
@@ -72,6 +77,25 @@ Fully connected         | {% if "connected" in phase %}✔️{% else %}❌{% end
 {% endfor %}
 </tbody>
 </table>
+{% endif %}
+
+{% if tags is defined %}
+<table markdown="1">
+<thead>
+<tr>
+<th>Tag</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody markdown="1">
+{% for tag_name, tag_data in tags.items() -%}
+<tr markdown="1">
+<td markdown="1">`{{ tag_name }}`</td>
+<td markdown="1">{{ tag_data }}</td>
+</tr>
+{% endfor %}
+</tbody>
+</table>
 {%  endif %}
 
 {% if extra is defined %}