The San Diego Padres and shortstop Khalil Greene agreed to terms on a two-year, $11 million guaranteed contract on Sunday, according to the San Diego Union-Tribune. Greene was named the team's MVP for the 2007 season.