Boris Diaw has agreed to a two-year, $9 million contract with the Spurs.

Diaw joined the Spurs in March after being waived by the Bobcats.