The Atlanta Braves have agreed to a two-year contract with Jason Grilli.

The deal, which the team announced, includes a team option for 2017.

Grilli is expected to become the setup man for Craig Kimbrel.