import later fedora-branch tweaks