One more step in the direction of a working out-of-tree-build