diff --git a/config/meson.build b/config/meson.build
index db7c49346..ad13c48a9 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -24,8 +24,11 @@ if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
 endif
 
 if build_xorg
-    install_data('10-quirks.conf',
-                 install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'))
+    install_data(
+      '10-quirks.conf',
+      install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'),
+      install_tag: 'runtime',
+    )
 endif
 
 libxserver_config = static_library('libxserver_config',
diff --git a/dix/meson.build b/dix/meson.build
index fbbcf8646..c45406865 100644
--- a/dix/meson.build
+++ b/dix/meson.build
@@ -61,4 +61,5 @@ libxserver_main = static_library('libxserver_main',
 install_data(
     'protocol.txt',
     install_dir: serverconfigdir,
+    install_tag: 'runtime',
 )
diff --git a/doc/dtrace/meson.build b/doc/dtrace/meson.build
index 09b606990..a11f66362 100644
--- a/doc/dtrace/meson.build
+++ b/doc/dtrace/meson.build
@@ -17,6 +17,7 @@ if build_docs
         build_by_default: true,
         install: true,
         install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
+        install_tag: 'doc',
     )
 
     if build_docs_pdf
@@ -36,6 +37,7 @@ if build_docs
                 build_by_default: true,
                 install: true,
                 install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
+                install_tag: 'doc',
             )
         endforeach
     endif
@@ -59,6 +61,7 @@ if build_docs
             build_by_default: true,
             install: true,
             install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
+            install_tag: 'doc',
         )
     endforeach
 endif
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index c4db85cdb..dcf9e550d 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -142,7 +142,9 @@ meson.add_install_script(
     'sh', '-c',
     'ln -fs Xorg @0@@1@'.format(
         '${DESTDIR}',
-        join_paths(get_option('prefix'), get_option('bindir'), 'X')))
+        join_paths(get_option('prefix'), get_option('bindir'), 'X')),
+    install_tag: 'runtime',
+)
 
 if get_option('suid_wrapper')
     executable('Xorg.wrap',
diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
index bee2eb324..469b61ad0 100644
--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
@@ -210,7 +210,7 @@ desktop_file = configure_file(
 )
 datadir = join_paths(get_option('prefix'), get_option('datadir'))
 desktopdir = join_paths(datadir, 'applications')
-install_data(desktop_file, install_dir : desktopdir)
+install_data(desktop_file, install_dir : desktopdir, install_tag : 'runtime')
 
 meson.override_find_program('Xwayland', xwayland_server)
 meson.override_dependency('xwayland', declare_dependency(
diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build
index 546777c64..3443885da 100644
--- a/hw/xwin/meson.build
+++ b/hw/xwin/meson.build
@@ -170,7 +170,8 @@ executable(
 
 install_data(
     'system.XWinrc',
-    install_dir: join_paths(get_option('sysconfdir'), 'X11')
+    install_dir: join_paths(get_option('sysconfdir'), 'X11'),
+    install_tag: 'runtime',
 )
 
 xwin_man = configure_file(
diff --git a/meson.build b/meson.build
index 1da05c48b..b76083269 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('xserver', 'c',
             'c_std=gnu99',
         ],
         version: '21.1.99.1',
-        meson_version: '>= 0.58.0',
+        meson_version: '>= 0.60.0',
 )
 release_date = '2021-07-05'
 
@@ -914,8 +914,11 @@ if build_xorg
                                 'pkgconfig'),
     )
 
-    install_data('xorg-server.m4',
-                 install_dir: join_paths(get_option('datadir'), 'aclocal'))
+    install_data(
+        'xorg-server.m4',
+        install_dir: join_paths(get_option('datadir'), 'aclocal'),
+        install_tag: 'devel',
+    )
 endif
 
 if build_docs or build_docs_devel