Fixes for compatibility with Arch Linux.
Merge pull request #1 from agraef/master

Fixes for compatibility with Arch Linux.