As with my openrc commit, only tested on x86_64
rebased onto bfe140dde173ed4ec437039eeda4bb5e6464fea2
Pull-Request has been merged by billauger
As with my openrc commit, only tested on x86_64