The 2011 TBS Just For Laughs Chicago comedy festival has added some more names, and big names, too, as Martin Short will return to the festival this June, but with Steve Martin!

Other additions include Seth Meyers, Ron White, Rodney Carrington and Jo Koy, while Hannibal Buress, Kumail Nanjiani, Kristen Schaal and Paul F. Tompkins have been named as the "special guests, who are also comedians and friends of" Demetri Martin for his June 16 show at the festival.

THE CHICAGO THEATRE:  Steve Martin and Martin Short in a Very Stupid Conversation ‚Äì Sunday, June 19 at 7:30 p.m. For the first time ever, two of the funniest Martins ‚Äì Steve Martin and Martin Short ‚Äì perform together on stage for the first time, taking to The Chicago Theatre for a historical event June 19 with their special show Steve Martin and Martin Short in a Very Stupid Conversation.

THE ROSEMONT THEATRE: Ron White & Rodney Carrington ‚Äì Wednesday, June 15, at 8 p.m.

THE VIC THEATRE: Seth Meyers ‚Äì Saturday, June 18, at 7:30 p.m.

Tickets for the new added shows go on sale April 30.