diff --git a/gencapdefs.py b/gencapdefs.py
index b1d2ebf2..2c6b28f9 100644
--- a/gencapdefs.py
+++ b/gencapdefs.py
@@ -87,6 +87,18 @@ CAPDEFS = [
         url="https://ircv3.net/specs/extensions/message-tags.html",
         standard="IRCv3",
     ),
+    CapDef(
+        identifier="Metadata",
+        name="draft/metadata",
+        url="https://github.com/DanielOaks/ircv3-specifications/blob/metadata/core/metadata.md",
+        standard="draft IRCv3",
+    ),
+    CapDef(
+        identifier="MetadataNotify",
+        name="metadata-notify",
+        url="https://github.com/DanielOaks/ircv3-specifications/blob/metadata/core/metadata.md",
+        standard="draft IRCv3",
+    ),
     CapDef(
         identifier="MultiPrefix",
         name="multi-prefix",
diff --git a/irc/caps/defs.go b/irc/caps/defs.go
index 7eea8867..1512e65b 100644
Binary files a/irc/caps/defs.go and b/irc/caps/defs.go differ
diff --git a/irc/numerics.go b/irc/numerics.go
index 79afff9f..5322ac52 100644
--- a/irc/numerics.go
+++ b/irc/numerics.go
@@ -183,6 +183,21 @@ const (
 	RPL_MONLIST                   = "732"
 	RPL_ENDOFMONLIST              = "733"
 	ERR_MONLISTFULL               = "734"
+	RPL_WHOISKEYVALUE             = "760"
+	RPL_KEYVALUE                  = "761"
+	RPL_METADATAEND               = "762"
+	ERR_METADATALIMIT             = "764"
+	ERR_TARGETINVALID             = "765"
+	ERR_NOMATCHINGKEY             = "766"
+	ERR_KEYINVALID                = "767"
+	ERR_KEYNOTSET                 = "768"
+	ERR_KEYNOPERMISSION           = "769"
+	RPL_METADATASUBOK             = "770"
+	RPL_METADATAUNSUBOK           = "771"
+	RPL_METADATASUBS              = "772"
+	ERR_METADATATOOMANYSUBS       = "773"
+	ERR_METADATASYNCLATER         = "774"
+	ERR_METADATARATELIMIT         = "775"
 	RPL_LOGGEDIN                  = "900"
 	RPL_LOGGEDOUT                 = "901"
 	ERR_NICKLOCKED                = "902"