diff --git a/meson.build b/meson.build
index f050cc66a39..559bef44ac4 100644
--- a/meson.build
+++ b/meson.build
@@ -364,19 +364,9 @@ with_gbm = get_option('gbm') \
   .disable_auto_if(not with_dri) \
   .allowed()
 
-_xlib_lease = get_option('xlib-lease')
-if _xlib_lease == 'true'
-  _xlib_lease = 'enabled'
-  warning('xlib_lease option "true" deprecated, please use "enabled" instead.')
-elif _xlib_lease == 'false'
-  _xlib_lease = 'disabled'
-  warning('xlib_lease option "false" deprecated, please use "disabled" instead.')
-endif
-if _xlib_lease == 'auto'
-  with_xlib_lease = with_platform_x11 and system_has_kms_drm
-else
-  with_xlib_lease = _xlib_lease == 'enabled'
-endif
+with_xlib_lease = get_option('xlib-lease') \
+  .require(with_platform_x11 and system_has_kms_drm, error_message : 'xlib-lease requires X11 and KMS/DRM support') \
+  .allowed()
 
 if with_platform_wayland
   c_args += '-DVK_USE_PLATFORM_WAYLAND_KHR'
diff --git a/meson_options.txt b/meson_options.txt
index 2fe9a07ca80..6bbafd3c519 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -412,9 +412,7 @@ option(
 )
 option(
   'xlib-lease',
-  type : 'combo',
-  value : 'auto',
-  choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
+  type : 'feature',
   description : 'Enable VK_EXT_acquire_xlib_display.'
 )
 option(