More fixes for compatibility with Arch Linux.
Merge pull request #2 from agraef/master

More fixes for compatibility with Arch Linux.