By Dan Snierson
May 15, 2013 at 04:19 PM EDT
Kevork Djansezian/NBC/NBC via Getty Images

The Simpsons will go for laughs next season by putting on a Wiig: Kristen Wiig, the former Saturday Night Live star who returned as host on May 11, is lending her voice to an episode that is slated to air on Fox in the fall, EW has learned.

In “Homerland,” Homer starts to act strangely polite after returning from a nuclear power plant convention, prompting a suspicious Lisa to ask an intense FBI agent (Wiig) to help her solve this mystery.

This isn’t Wiig’s first trip to Springfield: She played a substitute music teacher who draws the interest of Principal Skinner in a season 22 episode.

Other celebs who will pop up in the animated comedy’s 25th season include Aaron Sorkin and Stan Lee.

Read more:

‘The Simpsons’: Seth MacFarlane episode will now air as season finale on May 19

‘The Simpsons’: Stan Lee to guest

Aaron Sorkin to cameo on ‘The Simpsons’

‘Saturday Night Live’ recap: Kristen Wiig makes her return