Initial import

Patches courtesy of Fedora.