merge patch from gentoo