Changes for Fedora 16 and later