diff --git a/meson.build b/meson.build
index 11204c887..1a48dfc51 100644
--- a/meson.build
+++ b/meson.build
@@ -65,11 +65,11 @@ foreach dep: [
                    required: false, static: b_static)
 
     optname = 'enable_@0@'.format(dep[0].split('-')[0])
-    if d.found() and get_option(optname) != 'false'
+    if d.found() and get_option(optname) != 'disabled'
         deps += d
         conf.set('WITH_@0@'.format(dep[0].split('-')[0].to_upper()), '1')
         dep_avail += dep[2]
-    elif get_option(optname) == 'true'
+    elif get_option(optname) == 'enabled'
         error('@0@ enabled but not found'.format(dep[2]))
     endif
 endforeach
diff --git a/meson_options.txt b/meson_options.txt
index 690d080c1..f80de7e63 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,21 +1,21 @@
-option('static', type : 'boolean', value : false, description : 'Build statically linked executable')
+option('static', type: 'boolean', value: false, description: 'Build statically linked executable')
 
-option('enable_alsa', type : 'combo', choices : ['auto', 'true', 'false'], description : 'ALSA audio output')
-option('enable_openal', type : 'combo', choices : ['auto', 'true', 'false'], description : 'OpenAL audio output')
-option('enable_libpulse', type : 'combo', choices : ['auto', 'true', 'false'], description : 'PulseAudio audio output')
-option('enable_portaudio', type : 'combo', choices : ['auto', 'true', 'false'], description : 'PortAudio audio output')
-option('default_audio_output', type : 'combo', choices : ['auto', 'ALSA', 'OpenAL', 'PulseAudio', 'PortAudio'], description : 'Default audio output')
+option('enable_alsa', type: 'feature', description: 'ALSA audio output')
+option('enable_openal', type: 'feature', description: 'OpenAL audio output')
+option('enable_libpulse', type: 'feature', description: 'PulseAudio audio output')
+option('enable_portaudio', type: 'feature', description: 'PortAudio audio output')
+option('default_audio_output', type: 'combo', choices: ['auto', 'ALSA', 'OpenAL', 'PulseAudio', 'PortAudio'], description: 'Default audio output')
 
-option('enable_ffms2', type : 'combo', choices : ['auto', 'true', 'false'], description : 'FFMS2 video source')
+option('enable_ffms2', type: 'feature', description: 'FFMS2 video source')
 
-option('enable_fftw3', type : 'combo', choices : ['auto', 'true', 'false'], description : 'FFTW3 support')
-option('enable_hunspell', type : 'combo', choices : ['auto', 'true', 'false'], description : 'Hunspell spell checker')
-option('enable_uchardet', type : 'combo', choices : ['auto', 'true', 'false'], description : 'uchardet character encoding detection')
+option('enable_fftw3', type: 'feature', description: 'FFTW3 support')
+option('enable_hunspell', type: 'feature', description: 'Hunspell spell checker')
+option('enable_uchardet', type: 'feature', description: 'uchardet character encoding detection')
 
-option('system_luajit', type : 'boolean', value : false, description : 'Force using system luajit')
+option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit')
 
-option('build_credit', type : 'string', value : '', description : 'Build credit shown in program title')
+option('build_credit', type: 'string', value: '', description: 'Build credit shown in program title')
 
-option('enable_update_checker', type : 'boolean', value : false, description : 'Enable the update checker')
-option('update_server', type : 'string', value : 'updates.aegisub.org', description : 'Server to use for the update checker')
-option('update_url', type : 'string', value : '/trunk', description : 'Base path to use for the update checker')
+option('enable_update_checker', type: 'boolean', value: false, description: 'Enable the update checker')
+option('update_server', type: 'string', value: 'updates.aegisub.org', description: 'Server to use for the update checker')
+option('update_url', type: 'string', value: '/trunk', description: 'Base path to use for the update checker')