7 files changed, 14 insertions, 4 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
index 17573ab124e..7ddcd9fb096 100644
--- a/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.core.tlpsrc
@@ -10,3 +10,4 @@ longdesc   00texlive-installation.config(.tlpsrc)
 runpattern f texmf/README
 runpattern f texmf-dist/README
 runpattern f texmf-doc/README
+runpattern f tl-portable*
diff --git a/Master/tlpkg/tlpsrc/a2ping.tlpsrc b/Master/tlpkg/tlpsrc/a2ping.tlpsrc
index 244bd2dffea..60574801e50 100644
--- a/Master/tlpkg/tlpsrc/a2ping.tlpsrc
+++ b/Master/tlpkg/tlpsrc/a2ping.tlpsrc
@@ -1,3 +1,3 @@
 name a2ping
 category TLCore
-docpattern f texmf/doc/man/man1/a2ping.*
+docpattern +f texmf/doc/man/man1/a2ping.1
diff --git a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
index 59f6560f9e6..fb36514bd50 100644
--- a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
@@ -12,7 +12,6 @@ docpattern f texmf/doc/info/kpathsea.info*
 docpattern f texmf/doc/info/tds.info
 docpattern f texmf/doc/info/web2c.info*
 docpattern f texmf/doc/kpathsea/*
-docpattern f texmf/doc/man/man1/fmtutil.*
 docpattern f texmf/doc/man/man1/kpseaccess.1
 docpattern f texmf/doc/man/man1/kpsepath.1
 docpattern f texmf/doc/man/man1/kpsereadlink.1
@@ -29,7 +28,6 @@ docpattern f texmf/doc/man/man1/mktexmf.1
 docpattern f texmf/doc/man/man1/mktexpk.1
 docpattern f texmf/doc/man/man1/mktextfm.1
 docpattern f texmf/doc/man/man1/texhash.1
-docpattern f texmf/doc/man/man5/fmtutil.cnf.5
 docpattern f texmf/doc/web2c/*
 binpattern f bin/${ARCH}/kpseaccess
 binpattern f bin/${ARCH}/kpsepath
diff --git a/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
index 596615451f0..23045fa219c 100644
--- a/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
@@ -15,6 +15,7 @@ docpattern f texmf/doc/man/man1/fmtutil*
 docpattern f texmf/doc/man/man1/fontinst.*
 docpattern f texmf/doc/man/man1/texlinks.*
 docpattern f texmf/doc/man/man1/updmap*
+docpattern f texmf/doc/man/man5/fmtutil.cnf.*
 docpattern f texmf/doc/man/man5/updmap.*
 docpattern f texmf/doc/tetex/*
 binpattern f bin/${ARCH}/allcm
diff --git a/Master/tlpkg/tlpsrc/bin-tlgs.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-tlgs.win32.tlpsrc
index 5ce92a17a16..e427f138bec 100644
--- a/Master/tlpkg/tlpsrc/bin-tlgs.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tlgs.win32.tlpsrc
@@ -1,6 +1,5 @@
 name bin-tlgs.win32
 category TLCore
-runpattern f tlpkg/tlgs/README.TEXLIVE
 binpattern d/win32 tlpkg/tlgs
 binpattern d/win32 texmf/scripts/texlive/gswin32
 binpattern f bin/win32/eps2eps.bat
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index e8e76fa6ec8..a9d62261893 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -3,5 +3,13 @@ category Package
 runpattern +d texmf-dist/context/config
 runpattern +d texmf-dist/context/data
 runpattern +d texmf-dist/fonts/misc/cid/fontforge
+#
+# these have their own TL package, and are not part of core context.
 runpattern +!d texmf-dist/tex/context/third
+docpattern +!d texmf-dist/fonts/misc/xetex/fontmapping/context
+#
+# should be fixed in next release of these pacages:
 runpattern +!d texmf-dist/tex/context/pgf
+runpattern +!d texmf-dist/tex/context/pgfplots
+docpattern +!d texmf-dist/doc/context/pgfplots
+run
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index 163845a3a91..c54da8838a5 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -1,5 +1,8 @@
 name xetex
 category Package
 runpattern +!d texmf-dist/fonts/misc/xetex/fontmapping/arabxetex
+runpattern +!d texmf-dist/tex/xetex/xetex-pstricks
+runpattern +!d texmf-dist/tex/xetex/xetexfontinfo
+docpattern +!d texmf-dist/doc/xetex/xetexfontinfo
 depend bin-xetex