The Goldbergs will soon be flirting with the ’90s.

ABC has handed the circa-’80s comedy a two-season renewal, ensuring that the Wednesday staple will remain on the air through Season 6.

The pickup comes less than 24 hours after ABC similarly renewed fellow Wednesday stalwart Modern Family for two seasons.

Also in contention for the 2017-18 season is a ’90s-set Goldbergs spinoff centering on high school gym teacher Rick Mellor, a recurring character on the mothership; Bryan Callen, who plays Mellor, is attached to star. The premise: Mellor and another high school teacher team up to act as father figures to the kids at their Philadelphia school.