diff --git a/hw/xquartz/bundle/meson.build b/hw/xquartz/bundle/meson.build
index 20afb96ea..1305ccf23 100644
--- a/hw/xquartz/bundle/meson.build
+++ b/hw/xquartz/bundle/meson.build
@@ -57,7 +57,6 @@ install_data('PkgInfo',
     install_mode: 'rw-r--r--')
 
 install_data('X11.sh',
-    rename: 'X11',
     install_dir: join_paths(bundle_root, 'Contents/MacOS'),
     install_mode: 'rwxr-xr-x')
 
diff --git a/hw/xquartz/mach-startup/meson.build b/hw/xquartz/mach-startup/meson.build
index a1c782b1f..2f7694252 100644
--- a/hw/xquartz/mach-startup/meson.build
+++ b/hw/xquartz/mach-startup/meson.build
@@ -70,6 +70,17 @@ x11_bin = executable('X11.bin',
      install_dir: x11appdir,
 )
 
+# X11 (Bundle trampoline)
+x11 = executable('X11',
+     [
+      'bundle_trampoline.c',
+     ],
+     c_args: xquartz_defs,
+     link_args: ['-Objc'],
+     install: true,
+     install_dir: x11appdir,
+)
+
 # Xquartz
 xquartz_deps = [
     dependency('CoreServices', method: 'extraframework'),