According FOXSports’ Jon Paul Morosi, the San Francisco Giants and Aubrey Huff have agreed to a two-year, $22 million deal with a club option for 2013. Huff will make $10 million in 2011 and 2012 and he has a $2 million buyout for 2013 should the Giants not exercise the option.

Morosi was the first to report that both sides were close to an agreement earlier this morning.

“We’re extremely excited to be able to re-sign Aubrey,” GM Brian Sabean said in a news release via the San Jose Mercury News’ Andrew Baggarly. “He was an integral part in the team’s success last season, not only with his outstanding play in the field, but also providing a great clubhouse presence.”

Huff wrapped a one-year, $3 million contract in San Francisco. He hit 26 home runs, drove in 86 RBIs and hit .290 during the regular season. Huff had offers from several clubs on the table, but said early in the off season that he wanted to return to the Giants.