MINNEAPOLIS — The Minnesota Twins will reinstate closer Matt Capps from the 15-day disabled list.

The Twins announced Thursday that Capps will return for tonight’s game against Oakland. He has been out for three weeks due to shoulder inflammation.

To make room on the roster, the Twins optioned right-handed reliever Kyle Waldrop back to Triple-A Rochester.

Capps pitched two innings on a rehab assignment with Class A Fort Myers, giving up one hit, one unearned run and striking out one. Waldrop gave up two earned runs, seven hits and three walks in four innings while striking out one.

The Twins also set their post-All-Star break rotation Thursday, with Francisco Liriano, then Cole De Vries and Brian Duensing starting this weekend against the A’s. Scott Diamond and Sam Deduno will follow next week.