Jimmy Kimmel will return to host the Oscars in 2018 -- and he's joking that he's going to top this year's embarrassing Oscar snafu.

Per Deadline, Academy issued a press release today announcing that the late night host is part of a "dream team." Academy President Cheryl Boone Isaac said, "Jimmy proved, from his opening monologue all the way through a finale we could never have imagined, that he is one our finest hosts in Oscar history."

Added Kimmel: "Hosting the Oscars was a highlight of my career and I am grateful to Cheryl, [Academy CEO] Dawn [Hudson] and the Academy for asking me to return to work with two of my favorite people, Mike De Luca and Jennifer Todd. If you think we screwed up the ending this year, wait until you see what we have planned for the 90th anniversary show!"

We expect plenty of jokes about this year's infamous envelope mix-up. And more jabs at Matt Damon's expense.

The 90th Academy Awards will air live on ABC Sunday, March 4, 2018.