diff --git a/include/meson.build b/include/meson.build
index ee5a6fb29..4d09e7dff 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -192,7 +192,7 @@ conf_data.set('XSYNC', '1')
 conf_data.set('XTEST', '1')
 conf_data.set('XV', build_xv)
 conf_data.set('XvExtension', build_xv)
-conf_data.set('XvMCExtension', build_xv)
+conf_data.set('XvMCExtension', build_xvmc)
 
 conf_data.set('HAVE_SHA1_IN_LIBNETTLE', '1') # XXX
 
diff --git a/meson.build b/meson.build
index 52aaac514..364c6148e 100644
--- a/meson.build
+++ b/meson.build
@@ -353,12 +353,17 @@ if build_xsecurity
     endif
 endif
 
+build_xv = get_option('xv')
+build_xvmc = get_option('xvmc')
+if not build_xv
+    build_xvmc = false
+endif
+
 # XXX: Allow configuration of these.
 build_apm = false
 build_acpi = false
 build_mitshm = true
 build_xselinux = false
-build_xv = true
 build_dga = false
 build_xf86vidmode = xf86vidmodeproto_dep.found()
 
diff --git a/meson_options.txt b/meson_options.txt
index 273ebaa22..8ba6edf3f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -71,6 +71,10 @@ option('xinerama', type: 'boolean', value: true,
        description: 'Xinerama extension')
 option('xcsecurity', type: 'boolean', value: false,
        description: 'Security extension')
+option('xv', type: 'boolean', value: true,
+       description: 'Xv extension')
+option('xvmc', type: 'boolean', value: true,
+       description: 'XvMC extension')
 
 option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
 option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')