diff --git a/meson.build b/meson.build
index 75a33685b5..d4522fef5b 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') == 'yes'
   relocatable_bundle = true
-elif get_option('relocatable-bundle') == 'disabled'
+elif get_option('relocatable-bundle') == 'no'
   relocatable_bundle = false
-else # == 'auto'
+else # == 'platform-default'
   # 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 0bacddd83d..10255dc9ca 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,9 +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: 'combo', value: 'auto', description: 'build with resources considered bundled under the same prefix',
-  choices: [ 'enabled', 'disabled', 'auto' ]
-)
+option('relocatable-bundle', type: 'combo', value: 'platform-default',
+                             description: 'build with resources considered bundled under the same prefix',
+                             choices: [ 'yes', 'no', 'platform-default' ])
 
 option('shmem-type',        type: 'combo',   value: 'auto', description: 'Shared memory transport type',
                                              choices: [ 'none', 'sysv', 'posix', 'win32', 'auto' ])