Merge pull request #398 from hynek/fix-build

Let’s try to fix the build once again, shall we?