diff --git a/api/client-server/directory.yaml b/api/client-server/directory.yaml
index 7a2a2378..0a69a8ec 100644
--- a/api/client-server/directory.yaml
+++ b/api/client-server/directory.yaml
@@ -98,10 +98,10 @@ paths:
                 description: The room ID for this room alias.
               servers:
                 type: array
-                description: A list of servers that are aware of this room ID.
+                description: A list of servers that are aware of this room alias.
                 items:
                   type: string
-                  description: A server which is aware of this room ID.
+                  description: A server which is aware of this room alias.
           examples:
             application/json: |-
               {
@@ -118,7 +118,7 @@ paths:
             application/json: |-
               {
                 "errcode": "M_NOT_FOUND",
-                "error": "Room ID !abnjk1jdasj98:capuchins.com not found."
+                "error": "Room alias #monkeys:matrix.org not found."
               }
       tags:
         - Room directory
diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index dfa77674..b5f31209 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -51,7 +51,9 @@
 
 - Spec clarifications:
 
-  - Fixed examples of ``m.room.member`` event and room state change,
+  - Fix response format and 404 example for room alias lookup
+    (`#960 <https://github.com/matrix-org/matrix-doc/pull/960>`)
+  - Fix examples of ``m.room.member`` event and room state change,
     and added a clarification on the membership event sent upon profile update
     (`#950 <https://github.com/matrix-org/matrix-doc/pull/950>`_).
   - Spell out the way that state is handled by ``POST /createRoom``