- use ./usr and not usr - remove duplicated directory entries - add directories from the other xsets
by Bernd Ernesti.