Updated to match new repos.

Also to get somcom to quit complaining about how his name is written :P.