--- texlive-20160523-source/texk/kpathsea/progname.c.orig	2016-09-26 02:28:43.905577892 +0200
+++ texlive-20160523-source/texk/kpathsea/progname.c	2016-09-26 02:29:06.305229563 +0200
@@ -668,7 +668,7 @@
   /* SELFAUTODIR is actually the parent of the invocation directory,
      and SELFAUTOPARENT the grandparent.  This is how teTeX did it.  */
   kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir));
-  sdir_parent = xdirname (sdir);
+  sdir_parent = strdup("/usr/share/texmf-dist");
   kpathsea_xputenv (kpse, "SELFAUTODIR", fix_selfdir (sdir_parent));
   sdir_grandparent = xdirname (sdir_parent);
   kpathsea_xputenv (kpse, "SELFAUTOPARENT", fix_selfdir (sdir_grandparent));
--- texlive-20160523-source/texk/texlive/linked_scripts/texlive/fmtutil.pl.orig	2016-09-26 10:31:10.380341790 +0200
+++ texlive-20160523-source/texk/texlive/linked_scripts/texlive/fmtutil.pl	2016-09-26 10:31:31.000067067 +0200
@@ -19,7 +19,7 @@
     die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
   }
   chomp($TEXMFROOT);
-  unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive");
+  unshift(@INC, "$TEXMFROOT/texmf-dist/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive");
   require "mktexlsr.pl";
   TeX::Update->import();
 }