Updated to match current code.google.com/p/gopam