diff --git a/library/DATABASEFNS b/library/DATABASEFNS
index e25c5366..5b24e24d 100644
--- a/library/DATABASEFNS
+++ b/library/DATABASEFNS
@@ -1,16 +1,17 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "20-Feb-2024 23:45:56" {DSK}<mnt>e>Interlisp>medley>library>DATABASEFNS.;4 18445  
+(FILECREATED " 2-May-2026 17:38:46" {DSK}<home>matt>Interlisp>medley>library>DATABASEFNS.;4 18684  
 
       :EDIT-BY "mth"
 
       :CHANGES-TO (FNS DUMPDB)
 
-      :PREVIOUS-DATE "19-Feb-2024 16:29:44" {DSK}<mnt>e>Interlisp>medley>library>DATABASEFNS.;1)
+      :PREVIOUS-DATE "29-Apr-2026 17:43:56" {DSK}<home>matt>Interlisp>medley>library>DATABASEFNS.;2
+)
 
 
 (* ; "
-Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
+Copyright (c) 1986, 1990-1993, 2024, 2026 by Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT DATABASEFNSCOMS)
@@ -164,7 +165,9 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
 (DEFINEQ
 
 (DUMPDB
-  [LAMBDA (FILE PROPFLG)                                     (* ; "Edited 20-Feb-2024 23:45 by mth")
+  [LAMBDA (FILE PROPFLG)                                     (* ; "Edited  2-May-2026 17:32 by mth")
+                                                             (* ; "Edited 29-Apr-2026 17:42 by mth")
+                                                             (* ; "Edited 20-Feb-2024 23:45 by mth")
                                                              (* ; "Edited  7-Feb-2024 18:26 by mth")
                                                            (* ; "Edited 27-Oct-2021 10:51 by larry")
                                                             (* ; "Edited 24-Oct-2021 16:24 by rmk:")
@@ -180,7 +183,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
         (LET ((SAVEDCOPYRIGHTFLG COPYRIGHTFLG)
               (SAVEDDEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER))
              (CL:UNWIND-PROTECT
-                 (PROG (DBFILE DBFN DBROOTFN FLCPR (FL (NAMEFIELD FILE))
+                 (PROG (DBFILE DBFN DBROOTFN FLCPR (FL (ROOTFILENAME FILE))
                               (FNS (FILEFNSLST FILE)))
                        (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE))
                        (SETQ DBROOTFN (ROOTFILENAME DBFN))
@@ -230,7 +233,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
                             (PRETTYDEF NIL DBFN
                                    `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T)
                                                (ERROR!)))
-                                     (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES]
+                                     (E [PRINT (CAR (GETPROP ',FL 'FILEDATES]
                                         (DUMPDATABASE ',FNS]
                            [COND
                               (PROPFLG (PRINT (FULLNAME DBFILE)
@@ -375,9 +378,9 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
 
 (RESETSAVE DWIMIFYCOMPFLG T)
 )
-(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024))
+(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024 2026))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1768 6793 (DBFILE 1778 . 3423) (DBFILE1 3425 . 4935) (DBFILE2 4937 . 6159) (LOAD 6161
- . 6391) (LOADFROM 6393 . 6581) (MAKEFILE 6583 . 6791)) (6849 17838 (DUMPDB 6859 . 11873) (LOADDB 
-11875 . 16750) (MAKEDB 16752 . 17836)))))
+  (FILEMAP (NIL (1783 6808 (DBFILE 1793 . 3438) (DBFILE1 3440 . 4950) (DBFILE2 4952 . 6174) (LOAD 6176
+ . 6406) (LOADFROM 6408 . 6596) (MAKEFILE 6598 . 6806)) (6864 18072 (DUMPDB 6874 . 12107) (LOADDB 
+12109 . 16984) (MAKEDB 16986 . 18070)))))
 STOP
diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM
index aa806c4c..1d284224 100644
Binary files a/library/DATABASEFNS.LCOM and b/library/DATABASEFNS.LCOM differ
diff --git a/sources/UNICODE-FORMATS b/sources/UNICODE-FORMATS
index a8b3a60c..9a4d7ae1 100644
--- a/sources/UNICODE-FORMATS
+++ b/sources/UNICODE-FORMATS
@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8)
 
-(FILECREATED "31-Mar-2026 09:03:25" {WMEDLEY}<sources>UNICODE-FORMATS.;4 218013 
+(FILECREATED " 7-May-2026 11:08:18" {MEDLEY}<sources>UNICODE-FORMATS.;5 218405 
 
       :EDIT-BY rmk
 
-      :PREVIOUS-DATE " 9-Mar-2026 13:11:16" {WMEDLEY}<sources>UNICODE-FORMATS.;3)
+      :CHANGES-TO (FNS SYSTEM-EXTERNALFORMAT)
+
+      :PREVIOUS-DATE "31-Mar-2026 09:03:25" {MEDLEY}<sources>UNICODE-FORMATS.;4)
 
 
 (PRETTYCOMPRINT UNICODE-FORMATSCOMS)
@@ -1246,7 +1248,8 @@
 (DEFINEQ
 
 (SYSTEM-EXTERNALFORMAT
-  [LAMBDA NIL                                                (* ; "Edited  6-Feb-2026 11:29 by rmk")
+  [LAMBDA NIL                                                (* ; "Edited  7-May-2026 11:08 by rmk")
+                                                             (* ; "Edited  6-Feb-2026 11:29 by rmk")
                                                              (* ; "Edited 31-Jan-2026 18:51 by rmk")
                                                              (* ; "Edited 10-Oct-2022 11:55 by lmm")
                                                              (* ; "Edited  7-Jul-2022 10:41 by rmk")
@@ -1254,9 +1257,13 @@
     (* ;; "Returns the name, sets the global.  For now, UTF-8 or through, could be something else.")
 
     (fetch (EXTERNALFORMAT NAME) of (SETQ *SYSTEM-EXTERNALFORMAT*
-                                     (FIND-FORMAT (FOR X IN '("LC_CTYPE" "LC_ALL" "LANG")
-                                                     WHEN (STRPOS ".UTF-8" (UNIX-GETENV X))
-                                                     DO (RETURN :UTF-8) FINALLY (RETURN :THROUGH])
+                                     (FIND-FORMAT (for X in '("LC_CTYPE" "LC_ALL" "LANG")
+                                                     when (STRPOS "UTF" (U-CASE (UNIX-GETENV X)))
+                                                     do 
+                                                        (* ;; 
+                                  "Should it check separately for 8?  Would anyone ever say UTF-16 ?")
+
+                                                        (RETURN :UTF-8) finally (RETURN :THROUGH])
 
 (MTOSYSSTRING
   [LAMBDA (MSTRING)                                          (* ; "Edited  6-Feb-2026 00:20 by rmk")
@@ -2756,20 +2763,20 @@
  (64994 8322) (64995 8323) (64996 8324) (64997 8325) (64998 8326) (64999 8327) (65000 8328) (65001 
 8329) (65002 8331) (65003 8330) (65004 8332) (65008 (48 824)))))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3431 19523 (UTF8.OUTCHARFN 3441 . 6457) (UTF8.SLUG.OUTCHARFN 6459 . 7123) (
-UTF8.INCCODEFN 7125 . 13404) (UTF8.PEEKCCODEFN 13406 . 18539) (\UTF8.BACKCCODEFN 18541 . 19521)) (
-19524 24439 (UTF16BE.OUTCHARFN 19534 . 20553) (UTF16BE.INCCODEFN 20555 . 21897) (UTF16BE.PEEKCCODEFN 
-21899 . 23243) (\UTF16BE.BACKCCODEFN 23245 . 24437)) (24440 29171 (UTF16LE.OUTCHARFN 24450 . 25566) (
-UTF16LE.INCCODEFN 25568 . 26697) (UTF16LE.PEEKCCODEFN 26699 . 27975) (\UTF16LE.BACKCCODEFN 27977 . 
-29169)) (29172 32219 (READBOM 29182 . 31251) (WRITEBOM 31253 . 32217)) (32220 36251 (
-MAKE-UNICODE-FORMATS 32230 . 36249)) (36319 40813 (UTF8.BINCODE 36329 . 39017) (\UTF8.FETCHCODE 39019
- . 40811)) (40814 46437 (UTF8.VALIDATE 40824 . 43421) (NUTF8-BYTE1-BYTES 43423 . 44160) (
-NUTF8-CODE-BYTES 44162 . 45219) (NUTF8-STRING-BYTES 45221 . 46113) (N-MCHARS 46115 . 46435)) (46501 
-47775 (MTOUCODE 46511 . 46680) (UTOMCODE 46682 . 46879) (MTOUCODE? 46881 . 47260) (UTOMCODE? 47262 . 
-47773)) (47776 54348 (MTOUSTRING 47786 . 48369) (UTOMSTRING 48371 . 48954) (MTOUTF8STRING 48956 . 
-53235) (UTF8TOMSTRING 53237 . 54346)) (54406 60114 (XTOUCODE 54416 . 54934) (UTOXCODE 54936 . 55444) (
-XTOUCODE? 55446 . 56507) (UTOXCODE? 56509 . 57592) (XTOUSTRING 57594 . 58289) (UTOXSTRING 58291 . 
-59034) (XTOUTF8STRING 59036 . 60112)) (60115 65294 (MERGE-UNICODE-TRANSLATION-TABLES 60125 . 62887) (
-UNICODE.UNMAPPED 62889 . 65292)) (69033 69286 (UNICODE-INIT 69043 . 69284)) (69307 70745 (
-SYSTEM-EXTERNALFORMAT 69317 . 70261) (MTOSYSSTRING 70263 . 70456) (SYSTOMSTRING 70458 . 70743)))))
+  (FILEMAP (NIL (3476 19568 (UTF8.OUTCHARFN 3486 . 6502) (UTF8.SLUG.OUTCHARFN 6504 . 7168) (
+UTF8.INCCODEFN 7170 . 13449) (UTF8.PEEKCCODEFN 13451 . 18584) (\UTF8.BACKCCODEFN 18586 . 19566)) (
+19569 24484 (UTF16BE.OUTCHARFN 19579 . 20598) (UTF16BE.INCCODEFN 20600 . 21942) (UTF16BE.PEEKCCODEFN 
+21944 . 23288) (\UTF16BE.BACKCCODEFN 23290 . 24482)) (24485 29216 (UTF16LE.OUTCHARFN 24495 . 25611) (
+UTF16LE.INCCODEFN 25613 . 26742) (UTF16LE.PEEKCCODEFN 26744 . 28020) (\UTF16LE.BACKCCODEFN 28022 . 
+29214)) (29217 32264 (READBOM 29227 . 31296) (WRITEBOM 31298 . 32262)) (32265 36296 (
+MAKE-UNICODE-FORMATS 32275 . 36294)) (36364 40858 (UTF8.BINCODE 36374 . 39062) (\UTF8.FETCHCODE 39064
+ . 40856)) (40859 46482 (UTF8.VALIDATE 40869 . 43466) (NUTF8-BYTE1-BYTES 43468 . 44205) (
+NUTF8-CODE-BYTES 44207 . 45264) (NUTF8-STRING-BYTES 45266 . 46158) (N-MCHARS 46160 . 46480)) (46546 
+47820 (MTOUCODE 46556 . 46725) (UTOMCODE 46727 . 46924) (MTOUCODE? 46926 . 47305) (UTOMCODE? 47307 . 
+47818)) (47821 54393 (MTOUSTRING 47831 . 48414) (UTOMSTRING 48416 . 48999) (MTOUTF8STRING 49001 . 
+53280) (UTF8TOMSTRING 53282 . 54391)) (54451 60159 (XTOUCODE 54461 . 54979) (UTOXCODE 54981 . 55489) (
+XTOUCODE? 55491 . 56552) (UTOXCODE? 56554 . 57637) (XTOUSTRING 57639 . 58334) (UTOXSTRING 58336 . 
+59079) (XTOUTF8STRING 59081 . 60157)) (60160 65339 (MERGE-UNICODE-TRANSLATION-TABLES 60170 . 62932) (
+UNICODE.UNMAPPED 62934 . 65337)) (69078 69331 (UNICODE-INIT 69088 . 69329)) (69352 71137 (
+SYSTEM-EXTERNALFORMAT 69362 . 70653) (MTOSYSSTRING 70655 . 70848) (SYSTOMSTRING 70850 . 71135)))))
 STOP
diff --git a/sources/UNICODE-FORMATS.LCOM b/sources/UNICODE-FORMATS.LCOM
index d21316db..4ca9973d 100644
Binary files a/sources/UNICODE-FORMATS.LCOM and b/sources/UNICODE-FORMATS.LCOM differ
