3 files changed, 4 insertions, 3 deletions

diff --git a/Resource/Init/gs_fonts.ps b/Resource/Init/gs_fonts.ps
index 63164d0ce..d2cd21e10 100644
--- a/Resource/Init/gs_fonts.ps
+++ b/Resource/Init/gs_fonts.ps
@@ -429,7 +429,7 @@ systemdict /NONATIVEFONTMAP known .setnativefontmapbuilt
     % record that we've been run
     //true //.setnativefontmapbuilt
   } ifelse
-} bind def
+} bind executeonly odef
 
 % Create the dictionary that registers the .buildfont procedure
 % (called by definefont) for each FontType.
@@ -951,7 +951,7 @@ $error /SubstituteFont { } put
       } ifelse
     } ifelse
   } if
-} bind def
+} bind executeonly def
 
 % any user of .putgstringcopy must use bind and executeonly
 /.putgstringcopy  %   <dict> <name> <string> .putgstringcopy -
diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps
index a83e4c342..c4f618d51 100644
--- a/Resource/Init/gs_init.ps
+++ b/Resource/Init/gs_init.ps
@@ -2276,6 +2276,7 @@ SAFER { .setsafeglobal } if
   /.composefontdict
   /.type1build
   /.origdefinefont /.origundefinefont /.origfindfont
+  /.buildnativefontmap
 
   % Used by a free user in the Library of Congress. Apparently this is used to
   % draw a partial page, which is then filled in by the results of a barcode
diff --git a/Resource/Init/gs_res.ps b/Resource/Init/gs_res.ps
index 588880feb..96a9c259e 100644
--- a/Resource/Init/gs_res.ps
+++ b/Resource/Init/gs_res.ps
@@ -982,7 +982,7 @@ userdict /.localcsdefaults //false put
     { //.fontstatusaux exec }
     { //false } ifelse
   } ifelse
-} bind def
+} bind executeonly def
 currentdict /.fontstatusaux .undef
 
 /Font mark