Individual Olympic gold medal record

IIRC, when Eric Heiden won 5 individual gold medals at the 1980 Winter Games, it was a record for individual (not team/relay/etc.) golds at a single Olympics. Is that true (nb Spitz had 4 individual and three relay golds at Munich) and has it been broken?

Wikipedia’s article on Phelps states that five of the eight medals he won in Beijing were in individual events and that ties with Eric Heiden (1980 Winter) and Vitaly Scherbo (1992 Summer).

And isn’t it nice to see the boards full of questions about a Phelps who isn’t a mad raving loonie?

Missed edit window - those are specifically individual gold medal wins for all three men and that record evidently still stands.