diff --git a/src/channels.c b/src/channels.c
index 051d7580..c219ca8c 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -954,7 +954,8 @@ SSH_PACKET_CALLBACK(channel_rcv_request)
         return SSH_PACKET_USED;
     }
 
-    if (strcmp(request, "auth-agent-req@openssh.com") == 0) {
+    if (strcmp(request, "auth-agent-req") == 0 ||
+        strcmp(request, "auth-agent-req@openssh.com") == 0) {
         int status;
 
         SAFE_FREE(request);
@@ -1119,6 +1120,7 @@ int ssh_channel_open_auth_agent(ssh_channel channel)
       return SSH_ERROR;
   }
 
+  /* FIXME use "auth-agent" from RFC9987 when it gets addoption */
   return channel_open(channel,
                       "auth-agent@openssh.com",
                       WINDOW_DEFAULT,
diff --git a/src/messages.c b/src/messages.c
index 429bfe5d..24b4ad3d 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -1496,7 +1496,8 @@ SSH_PACKET_CALLBACK(ssh_packet_channel_open)
         goto end;
     }
 
-    if (strcmp(type_c, "auth-agent@openssh.com") == 0) {
+    if (strcmp(type_c, "auth-agent") == 0 ||
+        strcmp(type_c, "auth-agent@openssh.com") == 0) {
         msg->channel_request_open.type = SSH_CHANNEL_AUTH_AGENT;
         goto end;
     }