Updating from timothysc for fedora packaging