--- texk/kpathsea/texmf.cnf	2018-03-10 14:07:53.169869036 +0000
+++ texk/kpathsea/texmf.cnf	2018-03-10 14:09:03.070172879 +0000
@@ -61,7 +61,7 @@
 
 % We used to have a separate /texmf tree with some core programs and files.
 % Keep the variable name.
-TEXMFMAIN = /usr/share/texmf-dist
+TEXMFMAIN = /usr/share/texmf
 
 % Local additions to the distribution trees.
 TEXMFLOCAL = /usr/share/texmf-local
@@ -103,7 +103,7 @@
 % The odd-looking $TEXMFAUXTREES$TEXMF... construct is so that if no auxtree is
 % ever defined (the 99% common case), no extra elements will be added to
 % the search paths. tlmgr takes care to end any value with a trailing comma.
-TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFDIST}
+TEXMF = {$TEXMFAUXTREES$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFDIST}
 
 % Where to look for ls-R files.  There need not be an ls-R in the
 % directories in this path, but if there is one, Kpathsea will use it.