More build fixes

Merged Bastien Nocera requested to merge wip/hadess/more-build-fixes into master

Seeing as 1.11 doesn't build correctly from tarballs, let's try this again...

Merge request reports