Sync with fedoraproject changes.