diff --git a/racket/collects/setup/unixstyle-install.rkt b/racket/collects/setup/unixstyle-install.rkt
index 9561c18e1a..62e2f8195e 100644
--- a/racket/collects/setup/unixstyle-install.rkt
+++ b/racket/collects/setup/unixstyle-install.rkt
@@ -106,6 +106,9 @@
 (define (ls . dir)
   (sort (map path->string (apply directory-list dir)) string<?))
 
+(define (ls* dir)
+  (if (directory-exists? dir) (ls dir) null))
+
 ;; convenient wrapper for a simple subprocess
 (define (run cmd . args)
   (let-values
@@ -260,13 +263,13 @@
     (when (file-exists? "gracket") (fix-executable "gracket"))
     (when (file-exists? "starter") (fix-executable "starter"))))
 
-(define (fix-desktop-files appsdir bindir sharerktdir)
+(define (fix-desktop-files appsdir bindir sharerktdir [appfiles #f])
   ;; For absolute mode, change `Exec' and `Icon' lines to
   ;; have absolute paths:
   (define (fixup-path at-dir orig-path)
     (build-path at-dir (let-values ([(base name dir?) (split-path orig-path)])
                          name)))
-  (for ([d (in-list (directory-list appsdir))])
+  (for ([d (in-list (or appfiles (directory-list appsdir)))])
     (when (regexp-match? #rx"[.]desktop$" d)
       (define ls (call-with-input-file (build-path appsdir d)
                    (lambda (i)
@@ -460,7 +463,7 @@
   (when (ormap (lambda (p) (regexp-match #rx"libracket.*[.]so" p)) (ls "lib"))
     (error "Cannot handle distribution of shared-libraries (yet)"))
   (with-handlers ([exn? (lambda (e) (undo-changes) (raise e))])
-    (define binfiles (if (directory-exists? "bin") (ls "bin") null)) ; see below
+    (define binfiles (ls* "bin"))
     (if (eq? 'windows (system-type))
         ;; Windows executables appear in the immediate directory:
         (for ([f (in-list (directory-list))])
@@ -473,6 +476,7 @@
     (do-tree "doc"      'doc #:missing 'skip) ; not included in text distros
     (do-tree "lib"      'librkt)
     (do-tree "include"  'includerkt)
+    (define appfiles (ls* "share/applications"))
     (do-tree "share/applications" 'apps #:missing 'skip) ; Unix only
     (parameterize ([current-skip-filter (make-apps-skip)])
       (do-tree "share" 'sharerkt))
@@ -492,7 +496,7 @@
     ;; we need to know which files need fixing
     (unless bundle?
       (fix-executables (dir: 'bin) (dir: 'librkt) binfiles)
-      (fix-desktop-files (dir: 'apps) (dir: 'bin) (dir: 'sharerkt))
+      (fix-desktop-files (dir: 'apps) (dir: 'bin) (dir: 'sharerkt) appfiles)
       (write-uninstaller)
       (write-config)))
   (when move?