BEVERLY HILLS, Calif. (AP) — Just a few months after Jimmy Fallon marked his first anniversary as host of “The Tonight Show,” NBC has signed him for six more years.

Calling him “the best there is,” NBC entertainment chairman Bob Greenblatt said Fallon, who turns 41 next month, will occupy the “Tonight” host chair until at least 2021.

Speaking to TV critics on Thursday, Greenblatt also announced that Rihanna will join “The Voice” as key adviser to the panel of judges, who will be Adam Levine, Blake Shelton, Pharrell and Gwen Stefani.

He said new additions to the cast of the holiday production of “The Wiz Live!” include “Hairspray” co-star Elijah Kelley (in the role of the Scarecrow), singer-songwriter-actor Ne-Yo (as the Tin Man) and Oscar-winning songwriter and actor Common, who will play the Gatekeeper to Emerald City.

Previously announced cast members in the musical production, airing live Dec. 3, include Queen Latifah, Mary J. Blige, David Alan Grier, Uzo Aduba, Amber Riley, Stephanie Mills and Shanice Williams as Dorothy.

Greenblatt also had two words on whether Republican presidential hopeful Donald Trump would ever return as host of “The Celebrity Apprentice”: “Absolutely not.”

Greenblatt said the show will not be back next season, but will return in the future with a new host. He didn’t speculate on whom that host might be, but said, “We’re obviously looking for a host who will make noise and is a big personality.”

Also on HuffPost:

– This feed and its contents are the property of The Huffington Post, and use is subject to our terms. It may be used for personal consumption, but may not be distributed on a website.