diff --git a/meson.build b/meson.build
index 8e16afceea9d896764a3ee2d148b8c0e3ca4f2b2..75a33685b504261cfc63f94c5c29da00faea03a9 100644
--- a/meson.build
+++ b/meson.build
@@ -305,11 +305,11 @@ no_dep = dependency('', required: false)
 ################################################################################
 # Mandatory Dependencies
 
-if get_option('relocatable-bundle').enabled()
+if get_option('relocatable-bundle') == 'enabled'
   relocatable_bundle = true
-elif get_option('relocatable-bundle').disabled()
+elif get_option('relocatable-bundle') == 'disabled'
   relocatable_bundle = false
-else # .auto()
+else # == 'auto'
   # By default, assume building for Windows or macOS everything to be on
   # the same prefix and can be relocated.
   # On other platforms, build-time paths are meaningful.
diff --git a/meson_options.txt b/meson_options.txt
index 7cfc02d9201ff52613deae204d7636691cf94fdf..0bacddd83d38d93c64241e5c233e3d213b213751 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,7 +7,9 @@ option('enable-multiproc',  type: 'boolean', value: true,   description: 'Suppor
 option('profiling',         type: 'boolean', value: false,  description: 'Enable profiling')
 option('windows-installer', type: 'boolean', value: false,  description: 'Generate files needed for the Windows installer')
 
-option('relocatable-bundle',type: 'feature', value: 'auto', description: 'build with resources considered bundled under the same prefix')
+option('relocatable-bundle',type: 'combo', value: 'auto', description: 'build with resources considered bundled under the same prefix',
+  choices: [ 'enabled', 'disabled', 'auto' ]
+)
 
 option('shmem-type',        type: 'combo',   value: 'auto', description: 'Shared memory transport type',
                                              choices: [ 'none', 'sysv', 'posix', 'win32', 'auto' ])