diff --git a/sources/MEDLEYFONTFORMAT b/sources/MEDLEYFONTFORMAT
index e64d6b0b..3a2379c5 100644
--- a/sources/MEDLEYFONTFORMAT
+++ b/sources/MEDLEYFONTFORMAT
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-
(FILECREATED "29-Apr-2026 22:52:28" {MEDLEY}<sources>MEDLEYFONTFORMAT.;311
 64392  
+
(FILECREATED "30-Apr-2026 08:56:22" {MEDLEY}<sources>MEDLEYFONTFORMAT.;312
 64895  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FNS MEDLEYFONT.FILENAME)
 
-      :PREVIOUS-DATE "17-Apr-2026 09:32:49" {MEDLEY}<sources>MEDLEYFONTFORMAT.;310)
+      :PREVIOUS-DATE "29-Apr-2026 22:52:28" {MEDLEY}<sources>MEDLEYFONTFORMAT.;311)
 
 
 (PRETTYCOMPRINT MEDLEYFONTFORMATCOMS)
@@ -896,15 +896,21 @@
 (DEFINEQ
 
 (MEDLEYFONT.FILENAME

-  [LAMBDA (FILE DIRECTORY)
                                   (* ; "Edited 29-Apr-2026 22:52 by rmk")


+  [LAMBDA (FILE DIRECTORY)
                                   (* ; "Edited 30-Apr-2026 08:54 by rmk")


                                                              (* ; "Edited 15-Apr-2026 00:41 by rmk")


                                                              (* ; "Edited 23-Jan-2026 15:10 by rmk")


                                                              (* ; "Edited  7-Oct-2025 11:50 by rmk")


                                                              (* ; "Edited  4-Sep-2025 08:48 by rmk")


                                                              (* ; "Edited 10-Jun-2025 11:02 by rmk")

-    (CL:IF (type?
 FONTSPEC FILE)
-        (CAR (FONTFILES FILE NIL DIRECTORY))
-        (PACKFILENAME 'BODY FILE 'DIRECTORY DIRECTORY))])
+    (CL:WHEN DIRECTORY                                       (* ; "Keep the host/directory.")

+        (SETQ DIRECTORY (PACKFILENAME 'NAME NIL 'EXTENSION NIL 'VERSION NIL 'BODY DIRECTORY)))
+    (if
 (type?
 FONTSPEC FILE)
+        then
 (SETQ FILE (\FONT.CHECKARGS FILE NIL NIL NIL NIL T))
+             (CL:UNLESS DIRECTORY
+                 [SETQ DIRECTORY (CAR (MKLIST (FONTDEVICEPROP FILE 'FONTDIRECTORIES])
+             (PACKFILENAME 'DIRECTORY DIRECTORY 'BODY (\FONTFILENAME FILE))
+      else
                                                   (* ; "File name")

+           (PACKFILENAME 'BODY FILE 'DIRECTORY DIRECTORY])
 )
 
 (ADDTOVAR DISPLAYFONTEXTENSIONS
 MEDLEYDISPLAYFONT)
@@ -962,5 +968,5 @@ MEDLEYFONT.GETFILEPROP 13811 . 17390) (MEDLEYFONT.FILEP 17392 . 19820) (MEDLEYFO
 MEDLEYFONT.READ.ITEM 29489 . 35638) (MEDLEYFONT.PEEK.ITEM 35640 . 36502) (MEDLEYFONT.READ.FONTPROPS 
 36504 . 36969) (MEDLEYFONT.READ.VERIFIEDFONT 36971 . 43298)) (43326 62676 (MEDLEYFONT.WRITE.CHARSET 
 43336 . 47975) (MEDLEYFONT.WRITE.ITEM 47977 . 57030) (MEDLEYFONT.WRITE.FONTPROPS 57032 . 61801) (
-MEDLEYFONT.WRITE.HEADER 61803 . 62674)) (62677 63507 (MEDLEYFONT.FILENAME 62687 . 63505)))))
+MEDLEYFONT.WRITE.HEADER 61803 . 62674)) (62677 64010 (MEDLEYFONT.FILENAME 62687 . 64008)))))
 STOP
diff --git a/sources/MEDLEYFONTFORMAT.LCOM b/sources/MEDLEYFONTFORMAT.LCOM
index 171ca3ce..bfd06312 100644
Binary files a/sources/MEDLEYFONTFORMAT.LCOM and b/sources/MEDLEYFONTFORMAT.LCOM differ