Out-of-tree configuration

Probably requires upstream changes.