Corrected dependency, slight file adjustments
Resolved Gentoo bug 461700