wip/rpm5/patches
