Make work with newer portage