upstreamed, reserched fixes Gifted unto pentoo