diff --git a/event-schemas/examples/m.room.message#m.audio b/event-schemas/examples/m.room.message#m.audio
index 367eb954061..8dda5d8aab8 100644
--- a/event-schemas/examples/m.room.message#m.audio
+++ b/event-schemas/examples/m.room.message#m.audio
@@ -6,7 +6,8 @@
     "info": {
       "duration": 2140786,
       "size": 1563685,
-      "mimetype": "audio/mpeg"
+      "mimetype": "audio/mpeg",
+      "autoplay": true
     },
     "msgtype": "m.audio"
   },
@@ -15,4 +16,4 @@
   "room_id": "!jEsUZKDJdhlrceRyVU:localhost",
   "type": "m.room.message",
   "sender": "@example:localhost"
-} 
+}
diff --git a/event-schemas/examples/m.typing b/event-schemas/examples/m.typing
index 1d2c517b912..884a4253cea 100644
--- a/event-schemas/examples/m.typing
+++ b/event-schemas/examples/m.typing
@@ -2,6 +2,8 @@
     "type": "m.typing",
     "room_id": "!z0mnsuiwhifuhwwfw:matrix.org",
     "content": {
-        "user_ids": ["@alice:matrix.org", "@bob:example.com"]
+        "user_ids": ["@alice:matrix.org", "@bob:example.com"],
+        "typing": ["@bob:example.com"],
+        "recording": ["@alice:matrix.org"]
     }
 }
diff --git a/event-schemas/schema/m.room.message#m.audio b/event-schemas/schema/m.room.message#m.audio
index cd55426c3b7..3aaff84c8a1 100644
--- a/event-schemas/schema/m.room.message#m.audio
+++ b/event-schemas/schema/m.room.message#m.audio
@@ -37,6 +37,10 @@
                         "duration": {
                             "type": "integer",
                             "description": "The duration of the audio in milliseconds."
+                        },
+                        "autoplay": {
+                            "type": "boolean",
+                            "description": "Hint that the audio should start playing automatically."
                         }
                     }
                 }
diff --git a/event-schemas/schema/m.typing b/event-schemas/schema/m.typing
index 705b3b6c7af..4594c2b2280 100644
--- a/event-schemas/schema/m.typing
+++ b/event-schemas/schema/m.typing
@@ -1,7 +1,7 @@
 {
     "type": "object",
-    "title": "Typing Event",
-    "description": "Informs the client of the list of users currently typing.",
+    "title": "Activity Event",
+    "description": "Informs the client of the list of active users (typing, recording, etc)",
     "allOf": [{
         "$ref": "core-event-schema/event.yaml"
     }],
@@ -10,12 +10,26 @@
             "type": "object",
             "properties": {
                 "user_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "The list of user IDs active in this room, if any."
+                },
+                "typing": {
                     "type": "array",
                     "items": {
                         "type": "string"
                     },
                     "description": "The list of user IDs typing in this room, if any."
-                }
+                },
+                "recording": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "description": "The list of user IDs recording an audio message in this room, if any."
+                },
             },
             "required": ["user_ids"]
         },