CLEVELAND (AP) Right-hander Josh Tomlin and the Cleveland Indians have agreed to a two-year contract, a deal that includes a club option for 2017.

Tomlin returned from shoulder surgery last year to go 7-2 with a 3.02 ERA in 10 starts. His agreement supersedes a $2.25 million, one-year deal that was reached Jan. 15.

Tomlin had shoulder surgery last March and began the season on the disabled list. He was activated in July, made one minor league start and then joined the Indians, solidifying the backend of one of the AL's strongest rotations. He went 3-1 in five starts in September, pitching two complete games.

More from FoxSports

He is 36-30 since making his first start for Cleveland in 2010. The 31-year-old currently is the longest-tenured player in Cleveland's organization.