--- texmf/web2c/texmfcnf.lua.orig	2012-09-15 20:31:18.102902927 +0200
+++ texmf/web2c/texmfcnf.lua	2012-09-15 20:36:10.995089077 +0200
@@ -50,7 +50,7 @@
             -- We have only one cache path but there can be more. The first writable one
             -- will be chosen but there can be more readable paths.
 
-            TEXMFCACHE      = "$TEXMFSYSVAR;$TEXMFVAR",
+            TEXMFCACHE      = "$TEXMFVAR;$TEXMFSYSVAR",
             TEXMFCONFIG     = "home:.texlive2012/texmf-config",
 
             -- I don't like this texmf under home and texmf-home would make more
@@ -76,7 +76,7 @@
             -- We need texmfos for a few rare files but as I have a few more bin trees
             -- a hack is needed. Maybe other users also have texmf-platform-new trees.
 
-            TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}",
+            TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN,/usr/share/texmf-dist}",
 
             TEXFONTMAPS     = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
             ENCFONTS        = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//",