diff --git a/meson.build b/meson.build
index eab67efa9..a247cf1f9 100644
--- a/meson.build
+++ b/meson.build
@@ -133,8 +133,7 @@ libeis_dep = dependency('libeis-1.0', version: libei_req)
 libei_dep = dependency('libei-1.0', version: libei_req)
 
 have_wayland = get_option('wayland')
-# For now always require X11 support
-have_x11 = true
+have_x11 = get_option('x11')
 have_xwayland = get_option('xwayland')
 have_x11_client = have_x11 or have_xwayland
 
diff --git a/meson_options.txt b/meson_options.txt
index 91344eddf..0f0c37922 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -45,6 +45,12 @@ option('xwayland',
   description: 'Enable Xwayland support'
 )
 
+option('x11',
+  type: 'boolean',
+  value: true,
+  description: 'Enable X11 support'
+)
+
 option('systemd',
   type: 'boolean',
   value: true,