diff --git a/app/meson.build b/app/meson.build
index 626e89f8..1b76ac47 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -69,12 +69,12 @@ else
     endif
 endif
 
-v4l2_support = get_option('v4l2') and host_machine.system() == 'linux'
+v4l2_support = get_option('v4l2').enabled() and host_machine.system() == 'linux'
 if v4l2_support
     src += [ 'src/v4l2_sink.c' ]
 endif
 
-usb_support = get_option('usb')
+usb_support = get_option('usb').enabled()
 if usb_support
     src += [
         'src/usb/aoa_hid.c',
diff --git a/meson_options.txt b/meson_options.txt
index d1030694..16a90800 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,5 +4,5 @@ option('prebuilt_server', type: 'string', description: 'Path of the prebuilt ser
 option('portable', type: 'boolean', value: false, description: 'Use scrcpy-server from the same directory as the scrcpy executable')
 option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
 option('server_debugger_method', type: 'combo', choices: ['old', 'new'], value: 'new', description: 'Select the debugger method (Android < 9: "old", Android >= 9: "new")')
-option('v4l2', type: 'boolean', value: true, description: 'Enable V4L2 feature when supported')
-option('usb', type: 'boolean', value: true, description: 'Enable HID/OTG features when supported')
+option('v4l2', type: 'feature', value: 'enabled', description: 'Enable V4L2 feature when supported')
+option('usb', type: 'feature', value: 'enabled', description: 'Enable HID/OTG features when supported')