diff --git a/Xext/security.c b/Xext/security.c
index 96e980c8b3..fc2dc10607 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -444,6 +444,15 @@ ProcSecurityGenerateAuthorization(ClientPtr client)
         return BadValue;
     }
 
+    if (client->swapped) {
+        swaps(&stuff->nbytesAuthProto);
+        swaps(&stuff->nbytesAuthData);
+        swapl(&stuff->valueMask);
+
+        unsigned long nvalues = (((CARD32 *) stuff) + client->req_len) - values;
+        SwapLongs(values, nvalues);
+    }
+
     /* check timeout */
     timeout = 60;
     if (stuff->valueMask & XSecurityTimeout) {