diff --git a/fb/meson.build b/fb/meson.build
index ef8e68ca2..bf85141f9 100644
--- a/fb/meson.build
+++ b/fb/meson.build
@@ -34,3 +34,14 @@ libxserver_fb = static_library('libxserver_fb',
 	dependencies: common_dep,
 	pic: true,
 )
+
+wfb_args = '-DFB_ACCESS_WRAPPER'
+
+libxserver_wfb = static_library('libxserver_wfb',
+	srcs_fb,
+	c_args: wfb_args,
+	include_directories: inc,
+	dependencies: common_dep,
+	pic: true,
+	build_by_default: false,
+)
diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index e2c91265d..36027f045 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -24,6 +24,18 @@ shared_module(
     install_dir: module_dir,
 )
 
+shared_module(
+    'wfb',
+    'fbmodule.c',
+
+    include_directories: [inc, xorg_inc],
+    c_args: [ xorg_c_args, wfb_args ],
+    dependencies: common_dep,
+    objects: libxserver_wfb.extract_all_objects(),
+
+    install: true,
+    install_dir: module_dir,
+)
 shared_module(
     'shadow',
     'shmodule.c',