More bands including NOFX and the comedy lineup have been announced for this summer's Bonnaroo Music & Arts Festival set for June 9 through 12 in Manchester, Tennessee. Previously announced acts include Arcade Fire, Eminem, the Decemberists, the Strokes, Buffalo Springfield, Lil Wayne and more. Check out the full lineup here.

The 2011 comedy lineup:
Lewis Black
420 Comedy Blaze hosted by Cheech Marin featuring Ralphie May
the stars of Workaholics
John Waters
Henry Rollins
Henson Alternative's Stuffed & Unstrung
The League (Paul Scheer, Nick Kroll, Jon Lajoie, Stephen Rannazzisi)
Donald Glover
The Gregory Brothers
Kathleen Madigan
Eugene Mirman
Ted Alexandro
Tim Minchin
Tig Notaro
Hannibal Buress
Craig Baldo
Nate Bargatze

Newly confirmed artists:
NOFX
Galactic
G. Love & Special Sauce
Black Uhuru Shpongle Presents Shpongletron Experience
Daniel Lanois' Black Dub Allen Toussaint (w Dr. John and The Original Meters)
Anthony B
Black Joe Lewis & the Honeybears
Ben Sollee
Graveyard
Dennis Coffey
Forro in the Dark
The Knux
Naomi Shelton & The Gospel Queens
Futurebirds
Hangaii