From the systemd side we tried to clean this up, and give a good
recommendation on how this really should look like. We should probably
get the XDG basedir spec updated accordingly, but I figure there will
be some opposition to that, since it was too vague before and
everybody found his own interpretation.