Updated build-system. Does this help you khz?