diff --git a/config/meson.build b/config/meson.build
index a4f73c7cd1..b233ae9477 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -23,19 +23,6 @@ if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
     srcs_config += 'wscons.c'
 endif
 
-if build_xorg
-    install_data('10-quirks.conf',
-                 install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'))
-    nvidia_conf = configuration_data()
-    nvidia_conf.set('libdir', join_paths(get_option('prefix'),get_option('libdir')))
-    configure_file(
-        input: '10-nvidia.conf.in',
-        output: '10-nvidia.conf',
-        configuration: nvidia_conf,
-        install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'),
-    )
-endif
-
 libxserver_config = static_library('xserver_config',
     srcs_config,
     include_directories: inc,
diff --git a/config/10-nvidia.conf.in b/hw/xfree86/compat/10-nvidia.conf.in
similarity index 100%
rename from config/10-nvidia.conf.in
rename to hw/xfree86/compat/10-nvidia.conf.in
diff --git a/config/10-quirks.conf b/hw/xfree86/compat/10-quirks.conf
similarity index 100%
rename from config/10-quirks.conf
rename to hw/xfree86/compat/10-quirks.conf
diff --git a/hw/xfree86/compat/meson.build b/hw/xfree86/compat/meson.build
index 2e34856152..435cf46033 100644
--- a/hw/xfree86/compat/meson.build
+++ b/hw/xfree86/compat/meson.build
@@ -16,3 +16,14 @@ xorg_compat = static_library('xorg_compat',
     dependencies: common_dep,
     include_directories: [inc, xorg_inc, top_dir_inc],
 )
+
+install_data('10-quirks.conf',
+             install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'))
+nvidia_conf = configuration_data()
+nvidia_conf.set('libdir', join_paths(get_option('prefix'),get_option('libdir')))
+configure_file(
+    input: '10-nvidia.conf.in',
+    output: '10-nvidia.conf',
+    configuration: nvidia_conf,
+    install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'),
+)