diff -Nur texlive-20140525-source.orig/texk/kpathsea/texmf.cnf texlive-20140525-source/texk/kpathsea/texmf.cnf
--- texlive-20140525-source.orig/texk/kpathsea/texmf.cnf	2014-04-22 16:07:54.000000000 -0500
+++ texlive-20140525-source/texk/kpathsea/texmf.cnf	2014-06-15 11:42:32.949359812 -0500
@@ -51,7 +51,7 @@
 % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
 % Kpathsea sets SELFAUTOLOC (the directory with the binary),
 % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
-TEXMFROOT = $SELFAUTOPARENT
+TEXMFROOT = $SELFAUTODIR/share
 
 % The main tree of distributed packages and programs:
 TEXMFDIST = $TEXMFROOT/texmf-dist
@@ -61,7 +61,7 @@
 TEXMFMAIN = $TEXMFDIST
 
 % Local additions to the distribution trees.
-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
+TEXMFLOCAL = $TEXMFROOT/texmf-local
 
 % TEXMFSYSVAR, where *-sys store cached runtime data.
 TEXMFSYSVAR = $TEXMFROOT/texmf-var