diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 1fd1f15df..0418ed56b 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -180,6 +180,12 @@ static const char *stdSubdirs[] = {
     XORG_MODULE_ABI_TAG "/input/",
     XORG_MODULE_ABI_TAG "/drivers/",
     XORG_MODULE_ABI_TAG "/extensions/",
+    // next try loading from legacy xlibre-25.0 ABI subdir
+    // TODO remove this in version 26
+    "xlibre-25.0/",
+    "xlibre-25.0/input/",
+    "xlibre-25.0/drivers/",
+    "xlibre-25.0/extensions/",
     // now try loading from legacy / unversioned directories
     "",
     "input/",
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index 06baa2344..5b1e51dbd 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -1,4 +1,4 @@
-module_abi_tag = 'xlibre-25.0'
+module_abi_tag = 'xlibre-25'
 module_abi_dir = join_paths(module_dir, module_abi_tag)
 
 xorg_inc = include_directories(