Prepare 6.7.0 2

This should address the issue of 6.7.0-1 FTBFS on a small number of architectures.

I've also backported a recent build system fix, although I haven't actually encountered the corresponding failure on Debian the same way I have on Fedora... Can't hurt to include it :)