Credit: Mike Powell/Allsport (via Getty Images) Photo: Greg Louganis, 1988

Some call him the greatest diver in history, but pretty soon someone will be calling him the greatest husband in history! (We hope.)

Olympic diving champion Greg Louganis, who won five Olympic medals, five World Championship titles and 47 national titles during his career, announced to People that he and his partner, Johnny Chaillot, are getting married.

"I finally met my soul mate – the more I fall in love with Johnny, the more I fall in love with myself. This is what the universe had in store for both of us," Greg, 53, says of his paralegal beau, 52.

A documentary to be released in 2014, Back On Board, tells Greg’s story, including his coming out and living with HIV.

In addition to being a world-championship diver, Greg counseled other divers as a coach on the reality show Splash. He currently is a mentor for the US Olympic Diving Team and a judge for the Red Bull Cliff Diving Tour. Oh, and other interests: he’s a dog agility competitor and a motivational speaker.

Congrats to the happy couple!