After bringing Patty Mills back a couple days ago, the San Antonio Spurs took care of the final piece of their offseason puzzle by agreeing to terms with free agent forward Boris Diaw, a hugely valuable piece off their bench. Diaw was an essential member of their championship run this season, filling in for Tim Duncan and Thiago Splitter in the paint and helping to stretch the floor.

He was particularly huge in the Finals against the Heat, averaging 6.2 points, 8.6 rebounds, and 5.8 assists. The first two years of Diaw’s deal are guaranteed, and will pay him $18.5 million in total. A third year would only cost San Antonio $4 million, and includes some built-in salary cap protections just in case the Spurs decide to rebuild before the end of the contract.

Now that they’ve locked up Diaw, the Spurs will reportedly next offer Pau Gasol their full mid-level exception. They’re off to a fine start in search of their sixth NBA title, and adding Gasol would be the icing on the cake.

[via Yahoo]