diff --git a/compiler-lib/compiler/commands/exe.rkt b/compiler-lib/compiler/commands/exe.rkt
index 305879651f..023ef4d671 100644
--- a/compiler-lib/compiler/commands/exe.rkt
+++ b/compiler-lib/compiler/commands/exe.rkt
@@ -3,7 +3,8 @@
          raco/command-name
          compiler/private/embed
          launcher/launcher
-         dynext/file)
+         dynext/file
+         setup/dirs)
 
 (define verbose (make-parameter #f))
 (define very-verbose (make-parameter #f))
@@ -29,6 +30,16 @@
    [("--gui") "Generate GUI executable"
     (gui #t)]
    [("-l" "--launcher") "Generate a launcher"
+    (when (or (find-addon-tethered-gui-bin-dir)
+              (find-addon-tethered-console-bin-dir))
+      ;; When an addon-executable directory is configured, treat the
+      ;; addon directory more like an installation directory, instead
+      ;; of a user-specific directory: record it, and remove the -U
+      ;; flag (if any)
+      (exe-embedded-flags
+       (append
+        (list "-A" (path->string (find-system-path 'addon-dir)))
+        (remove "-U" (exe-embedded-flags)))))
     (launcher #t)]
    [("--config-path") path "Set <path> as configuration directory for executable"
     (exe-embedded-config-path path)]
diff --git a/compiler-lib/info.rkt b/compiler-lib/info.rkt
index 4cbd2611a5..cce80f1f4a 100644
--- a/compiler-lib/info.rkt
+++ b/compiler-lib/info.rkt
@@ -2,7 +2,7 @@
 
 (define collection 'multi)
 
-(define deps '(["base" #:version "6.2.900.10"]
+(define deps '(["base" #:version "6.5.0.2"]
                "scheme-lib"
                "rackunit-lib"
                "zo-lib"))