18 files changed, 9 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.eight b/Master/texmf-dist/source/generic/knuth/errata/errata.eight
index f7ceafd9f69..f7ceafd9f69 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.eight
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.eight
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.eleven b/Master/texmf-dist/source/generic/knuth/errata/errata.eleven
index 64d9f8ab457..64d9f8ab457 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.eleven
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.eleven
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.five b/Master/texmf-dist/source/generic/knuth/errata/errata.five
index 4e2982f109a..4e2982f109a 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.five
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.five
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.four b/Master/texmf-dist/source/generic/knuth/errata/errata.four
index 11d0435e749..11d0435e749 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.four
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.four
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.nine b/Master/texmf-dist/source/generic/knuth/errata/errata.nine
index 3715cd813fc..3715cd813fc 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.nine
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.nine
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.one b/Master/texmf-dist/source/generic/knuth/errata/errata.one
index 471971958c3..471971958c3 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.one
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.one
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.seven b/Master/texmf-dist/source/generic/knuth/errata/errata.seven
index 0866189da51..0866189da51 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.seven
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.seven
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.six b/Master/texmf-dist/source/generic/knuth/errata/errata.six
index ad7444d8600..ad7444d8600 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.six
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.six
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.ten b/Master/texmf-dist/source/generic/knuth/errata/errata.ten
index 9efa2a3e503..9efa2a3e503 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.ten
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.ten
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.tex b/Master/texmf-dist/source/generic/knuth/errata/errata.tex
index 6842a82cc6e..6842a82cc6e 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.tex
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.tex
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.three b/Master/texmf-dist/source/generic/knuth/errata/errata.three
index 5f00f73b22e..5f00f73b22e 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.three
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.three
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.two b/Master/texmf-dist/source/generic/knuth/errata/errata.two
index 74dde877267..74dde877267 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errata.two
+++ b/Master/texmf-dist/source/generic/knuth/errata/errata.two
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/errorlog.tex b/Master/texmf-dist/source/generic/knuth/errata/errorlog.tex
index dc4845c1c19..dc4845c1c19 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/errorlog.tex
+++ b/Master/texmf-dist/source/generic/knuth/errata/errorlog.tex
diff --git a/Master/texmf-dist/doc/generic/knuth/source/errata/logmac.tex b/Master/texmf-dist/source/generic/knuth/errata/logmac.tex
index 8719efc497d..8719efc497d 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/errata/logmac.tex
+++ b/Master/texmf-dist/source/generic/knuth/errata/logmac.tex
diff --git a/Master/texmf-dist/doc/generic/knuth/source/tex/glue.web b/Master/texmf-dist/source/generic/knuth/tex/glue.web
index 38a6d667c88..38a6d667c88 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/tex/glue.web
+++ b/Master/texmf-dist/source/generic/knuth/tex/glue.web
diff --git a/Master/texmf-dist/doc/generic/knuth/source/web/webman.tex b/Master/texmf-dist/source/generic/knuth/web/webman.tex
index 61e12a28789..61e12a28789 100644
--- a/Master/texmf-dist/doc/generic/knuth/source/web/webman.tex
+++ b/Master/texmf-dist/source/generic/knuth/web/webman.tex
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 751234672a7..7e83f424145 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3598,17 +3598,19 @@ sub POSTknuth
 {
   print "POST$package - removing nonfree/duplicated files\n";
   #
-  &xchdir ("$DEST/doc");
-  &xmkdir ("generic");
-  &SYSTEM ("$MV knuth generic");
-  &SYSTEM ("$MV ../source/knuth generic/knuth/source");
-  &xchdir ("generic/knuth");
+  &xchdir ("$DEST");
+  &xmkdir ("doc/generic");
+  &SYSTEM ("$MV doc/knuth doc/generic/");
+  #
+  &xmkdir ("source/generic");
+  &SYSTEM ("$MV source/knuth source/generic/");
   #
   # remove nonfree.
+  &xchdir ("$DEST/doc/generic/knuth");
   &SYSTEM ("$RM tex/texbook.tex mf/mfbook.tex");
   #
   # remove sources that are in build tree.
-  &xchdir ("source");
+  &xchdir ("$DEST/source/generic/knuth");
   &SYSTEM ("rm -rf etc mf mfware tex/tex.web tex/trip* texware web/*.web");
 }
 
diff --git a/Master/tlpkg/tlpsrc/errata.tlpsrc b/Master/tlpkg/tlpsrc/errata.tlpsrc
index 419261f6269..7abc6d2b16a 100644
--- a/Master/tlpkg/tlpsrc/errata.tlpsrc
+++ b/Master/tlpkg/tlpsrc/errata.tlpsrc
@@ -1,2 +1 @@
-docpattern +!d texmf-dist/doc/generic/knuth/source/errata
-docpattern +!d texmf-dist/doc/generic/knuth/errata
+docpattern +!d texmf-dist/source/generic/knuth/errata