diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 789a61166..041b4faa6 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -3181,13 +3181,17 @@ input_handler(void *data, struct wl_registry *registry, uint32_t id,
         init_system_bell(xwl_screen, id, version);
     } else if (strcmp(interface, wl_fixes_interface.name) == 0) {
         xwl_screen->input_fixes =
-            wl_registry_bind(registry, id, &wl_fixes_interface, 1);
+            wl_registry_bind(registry, id, &wl_fixes_interface, min(version, 2));
     }
 }
 
 static void
 global_remove(void *data, struct wl_registry *registry, uint32_t name)
 {
+    struct xwl_screen *xwl_screen = data;
+
+    if (xwl_screen->input_fixes && wl_fixes_get_version(xwl_screen->input_fixes) >= WL_FIXES_ACK_GLOBAL_REMOVE_SINCE_VERSION)
+        wl_fixes_ack_global_remove(xwl_screen->input_fixes, xwl_screen->input_registry, name);
 }
 
 static const struct wl_registry_listener input_listener = {
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 890c1d819..a5067f884 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -571,7 +571,7 @@ registry_global(void *data, struct wl_registry *registry, uint32_t id,
 #endif
     else if (strcmp(interface, wl_fixes_interface.name) == 0) {
         xwl_screen->fixes =
-            wl_registry_bind(registry, id, &wl_fixes_interface, 1);
+            wl_registry_bind(registry, id, &wl_fixes_interface, min(version, 2));
     }
 }
 
@@ -597,6 +597,9 @@ global_remove(void *data, struct wl_registry *registry, uint32_t name)
             break;
         }
     }
+
+    if (xwl_screen->fixes && wl_fixes_get_version(xwl_screen->fixes) >= WL_FIXES_ACK_GLOBAL_REMOVE_SINCE_VERSION)
+        wl_fixes_ack_global_remove(xwl_screen->fixes, registry, name);
 }
 
 static const struct wl_registry_listener registry_listener = {
diff --git a/meson.build b/meson.build
index 560ca6f3e..7551ddafe 100644
--- a/meson.build
+++ b/meson.build
@@ -66,7 +66,7 @@ libdrm_req = '>= 2.4.116'
 libselinux_req = '>= 2.0.86'
 xext_req = '>= 1.0.99.4'
 xproto_req = '>= 7.0.31'
-wayland_req = '>= 1.23.91'
+wayland_req = '>= 1.25.90'
 wayland_protocols_req = '>= 1.38'
 gbm_req = '>= 10.2'
 xf86dgaproto_req = '>= 2.0.99.1'