diff -up ghostscript-9.07/Resource/Init/gs_dps.ps.cve-2019-6116-downstream ghostscript-9.07/Resource/Init/gs_dps.ps
--- ghostscript-9.07/Resource/Init/gs_dps.ps.cve-2019-6116-downstream	2019-02-27 16:40:45.235290444 +0100
+++ ghostscript-9.07/Resource/Init/gs_dps.ps	2019-02-27 16:41:27.054739624 +0100
@@ -118,7 +118,7 @@
   .dicttomark readonly /localdicts exch put
                 % localdicts is now defined in userdict.
                 % Copy the definitions into systemdict.
-  localdicts { .forcedef } forall
+  localdicts { .forcedef } executeonly forall
                 % Set the user parameters.
   userparams readonly .setuserparams
                 % Establish the initial gstate(s).
diff -up ghostscript-9.07/Resource/Init/gs_fonts.ps.cve-2019-6116-downstream ghostscript-9.07/Resource/Init/gs_fonts.ps
--- ghostscript-9.07/Resource/Init/gs_fonts.ps.cve-2019-6116-downstream	2019-02-27 16:43:10.993370606 +0100
+++ ghostscript-9.07/Resource/Init/gs_fonts.ps	2019-02-27 16:44:44.174143288 +0100
@@ -1110,7 +1110,7 @@ $error /SubstituteFont { } put
                       % Stack: fontdict
             } executeonly
            if pop % Stack: origfontname fontdirectory path
-         }
+         } executeonly
         if pop pop  % Stack: origfontname
 
                 % The font definitely did not load correctly.
diff -up ghostscript-9.07/Resource/Init/pdf_font.ps.cve-2019-6116-downstream ghostscript-9.07/Resource/Init/pdf_font.ps
--- ghostscript-9.07/Resource/Init/pdf_font.ps.cve-2019-6116-downstream	2019-02-27 16:45:45.838331086 +0100
+++ ghostscript-9.07/Resource/Init/pdf_font.ps	2019-02-27 16:47:02.411322516 +0100
@@ -614,7 +614,7 @@ currentdict end readonly def
             currentglobal 2 index dup gcheck setglobal
             /FontInfo 5 dict dup 5 1 roll .forceput
             setglobal
-          } if
+          } executeonly if
           dup /GlyphNames2Unicode .knownget not {
             //true			    % No existing G2U, make one
           } {
@@ -628,7 +628,7 @@ currentdict end readonly def
             currentglobal exch dup gcheck setglobal
             dup /GlyphNames2Unicode 100 dict dup 4 1 roll .forceput
             3 2 roll setglobal
-          } if                                 % font-res font-dict encoding|null font-info g2u
+          } executeonly if                     % font-res font-dict encoding|null font-info g2u
           exch pop exch                        % font-res font-dict g2u encoding|null
           userdict /.lastToUnicode get         % font-res font-dict g2u Encoding|null CMap
           .convert_ToUnicode-into-g2u          % font-res font-dict