Boris Diaw returning to San Antonio on a 3-year, $22.5 million deal

Following a strong postseason run in which he played a pivotal role for the Spurs, Boris Diaw will be back in San Antonio after agreeing to a three-year, $22.5 million deal, according to Adrian Wojnarowski of Yahoo! Sports.

The 32-year-old Diaw was a solid player for San Antonio during the regular season, but took on a bigger role in the playoffs and was one of the key contributors in San Antonio's Finals win against the Heat. He averaged 6.2 points, 8.6 rebounds and 5.8 assists per game in the Finals. His 26-point performance in Game 6 against Oklahoma City helped San Antonio win the Western Conference.

Diaw joined the Spurs during the 2011-12 season and was mostly a minimal contributor during his first two seasons. He moved into an expanded role this past season, with Gregg Popovich giving him more freedom to play within the system. While he still played mostly off the bench, he had his best statistical season since 2010-11.

According to Wojnarowski, the third year of the deal is only partially guaranteed. Diaw will earn $18.5 million during the first two years of the deal. Wojnarowski also reports the deal won't prevent the Spurs from pursuing free agent center Pau Gasol. Diaw's deal reportedly includes protections against the salary cap, giving the Spurs some flexibility down the road.

The 11-year veteran confirmed his return to San Antonio on Twitter.

Hey spurs fans, Good news i stay in san antonio for a few more years. Lets win it again #gospursgo http://t.co/dqkftfLuN1

— Boris Diaw (@theborisdiaw) July 6, 2014