Updated to upstream package, added git dependency.