diff --git a/config.h.meson b/config.h.meson
index d7fd48f9b..6f61ddeb0 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -106,3 +106,6 @@
 
 /* Whether the Xwayland -terminate supports a delay */
 #mesondefine HAVE_XWAYLAND_TERMINATE_DELAY
+
+/* Whether the Xwayland supports +/-byteswappedclients */
+#mesondefine HAVE_XWAYLAND_BYTE_SWAPPED_CLIENTS
diff --git a/meson.build b/meson.build
index 227725c94..56c1d7321 100644
--- a/meson.build
+++ b/meson.build
@@ -536,6 +536,7 @@ endif
 have_xwayland_initfd = false
 have_xwayland_listenfd = false
 have_xwayland_terminate_delay = false
+have_xwayland_byte_swapped_clients = false
 if have_xwayland
   xwayland_dep = dependency('xwayland', required: false)
 
@@ -597,6 +598,16 @@ if have_xwayland
   if (have_xwayland_terminate_delay)
     cdata.set('HAVE_XWAYLAND_TERMINATE_DELAY', 1)
   endif
+
+  # For Xwayland +/-byteswappedclients usage
+  if xwayland_dep.found()
+    have_xwayland_byte_swapped_clients = xwayland_dep.get_variable('have_byteswappedclients',
+                                                                   default_value: 'false') == 'true'
+  endif
+
+  if (have_xwayland_byte_swapped_clients)
+    cdata.set('HAVE_XWAYLAND_BYTE_SWAPPED_CLIENTS', 1)
+  endif
 endif
 
 optional_functions = [
@@ -678,6 +689,7 @@ summary('Profiler', have_profiler, section: 'Options')
 summary('Xwayland initfd', have_xwayland_initfd, section: 'Options')
 summary('Xwayland listenfd', have_xwayland_listenfd, section: 'Options')
 summary('Xwayland terminate delay', have_xwayland_terminate_delay, section: 'Options')
+summary('Xwayland byte-swapped clients', have_xwayland_byte_swapped_clients, section: 'Options')
 
 summary('Enabled', have_tests, section: 'Tests')
 summary('Core tests', have_core_tests, section: 'Tests')
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 564aad4cb..c3657cbd3 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -903,6 +903,13 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager,
   args[i++] = "7";
 #endif
 
+#ifdef HAVE_XWAYLAND_BYTE_SWAPPED_CLIENTS
+  if (meta_settings_are_xwayland_byte_swapped_clients_allowed (settings))
+    args[i++] = "+byteswappedclients";
+  else
+    args[i++] = "-byteswappedclients";
+#endif
+
   if (meta_settings_is_experimental_feature_enabled (settings,
                                                      META_EXPERIMENTAL_FEATURE_AUTOCLOSE_XWAYLAND))
 #ifdef HAVE_XWAYLAND_TERMINATE_DELAY