Cleaner support for Fedora, incl. 16 & 17