5 files changed, 14 insertions, 13 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index a3507742cc8..7ca16ba8688 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -32,8 +32,8 @@ longdesc See the TeXLive::TLPSRC documentation for more.
 # code, so we don't get repeatedly warned about them. Maybe someday a
 # better approach will come to mind.
 # 
-tlpsetvar global_latex_deps babel,cm,firstaid,hyphen-base,\
-latex-fonts,l3backend,l3kernel,l3packages,tex-ini-files,unicode-data
+tlpsetvar global_latex_deps atbegshi,atveryend,babel,cm,firstaid,hyphen-base,\
+l3backend,l3kernel,l3packages,latex-fonts,ms,tex-ini-files,unicode-data
 #
 # These packages are used by all LuaTeX variants - luatex, luajittex, luahbtex.
 tlpsetvar global_luatex_deps cm,etex,hyphen-base,knuth-lib,plain,\
diff --git a/Master/tlpkg/tlpsrc/cslatex.tlpsrc b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
index b4fda05bd83..e0bc4c55d54 100644
--- a/Master/tlpkg/tlpsrc/cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
@@ -1,7 +1,7 @@
 depend latex
 
-tlpsetvar fmtcomm cm,csplain,hyphen-base,\
-l3kernel,latex-fonts,latex,unicode-data
+tlpsetvar fmtcomm cm,csplain,firstaid,hyphen-base,\
+l3kernel,l3packages,latex-fonts,latex,unicode-data
 #
 execute AddFormat name=cslatex engine=pdftex \
           options="-etex cslatex.ini" \
diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
index 01af49b4ac7..f20cf84fd32 100644
--- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
@@ -4,14 +4,14 @@ depend pdftex
 depend tex
 
 # most of these are due to hyperref.
-tlpsetvar fmtcomm \
-amsfonts,atbegshi,atveryend,auxhook,babel,bigintcalc,bitset,cm,\
+tlpsetvar fmtcomm ${global_latex_deps},\
+amsfonts,auxhook,bigintcalc,bitset,\
 colortbl,cyrillic,dehyph,ec,etexcmds,fancyhdr,graphics,\
-graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,hyphen-base,iftex,\
-infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,l3kernel,latex,\
-latex-fonts,latexconfig,letltxmacro,ltxcmds,marvosym,\
+graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,iftex,\
+infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,latex,\
+latexconfig,letltxmacro,ltxcmds,marvosym,\
 passivetex,pdfescape,pdftexcmds,psnfss,rerunfilecheck,stmaryrd,\
-symbol,tex-ini-files,tipa,tools,ulem,uniquecounter,unicode-data,url,\
+symbol,tipa,tools,ulem,uniquecounter,url,\
 wasysym,zapfding
 #
 execute AddFormat name=jadetex engine=pdftex patterns=language.dat \
diff --git a/Master/tlpkg/tlpsrc/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc
index 95341a97e21..d8a41dc3fdf 100644
--- a/Master/tlpkg/tlpsrc/mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc
@@ -4,8 +4,8 @@ tlpsetvar fmtdeps cm,hyphen-base
 #
 execute AddFormat name=mllatex engine=pdftex patterns=language.dat \
           options="-translate-file=cp227.tcx -mltex *mllatex.ini" \
-          fmttriggers=${fmtdeps},babel,dehyph,hyph-utf8,l3kernel,\
-latex,latexconfig,latex-fonts,unicode-data
+          fmttriggers=${fmtdeps},babel,dehyph,firstaid,hyph-utf8,l3kernel,\
+l3packages,latex,latexconfig,latex-fonts,unicode-data
 #
 execute AddFormat name=mltex engine=pdftex \
            options="-translate-file=cp227.tcx -mltex mltex.ini" \
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index 6742b71829f..7d54e5585be 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -8,7 +8,8 @@ execute AddFormat name=xetex engine=xetex patterns=language.def \
 #
 execute AddFormat name=xelatex engine=xetex patterns=language.dat \
   options="-etex xelatex.ini" \
-  fmttriggers=${fmtcomm},babel,l3kernel,latex,latex-fonts,lm
+  fmttriggers=${fmtcomm},babel,firstaid,l3kernel,l3packages,\
+latex,latex-fonts,lm
 
 # do fontconfig stuff, especially on Windows.
 postaction script file=tlpkg/tlpostcode/xetex.pl