--- framework-ps.scm.orig	2015-12-08 10:44:54.293262621 +0200
+++ framework-ps.scm	2015-12-08 11:14:49.600462497 +0200
@@ -237,16 +237,16 @@
     (let* ((font (car font-name-filename))
            (name (cadr font-name-filename))
            (file-name (caddr font-name-filename))
-           (bare-file-name (ly:find-file file-name)))
+           (bare-file-name (ly:find-file file-name))
+           (font-file-name (ly:find-file (format #f "~a.otf" file-name))))
       (cons name
             (if (mac-font? bare-file-name)
                 (handle-mac-font name bare-file-name)
                 (cond
                  ((internal-font? file-name)
-                  (ps-load-file (ly:find-file
-                                 (format #f "~a.otf" file-name))))
-                 ((string? bare-file-name)
-                  (ps-load-file file-name))
+                  (ps-load-file font-file-name))
+                 ((string? font-file-name)
+                  (ps-load-file font-file-name))
                  (else
                   (ly:warning (_ "cannot embed ~S=~S") name file-name)
                   ""))))))