Michael Phelps Michael Phelps

Michael Phelps is diving into marriage! The Olympic swimmer proposed to his girlfriend.

Inside the hottest Oscar parties

On Sunday, Phelps popped the question to former Miss California 2010 Nicole Johnson. The 18-time Olympic gold medalist posted a picture of the two shortly after:

She said yes😁😁😁 @nicole.m.johnson. (Photo credit to @arschmitty )

A photo posted by Michael Phelps (@m_phelps00) on

Phelps and Johnson, both 29, have been dating on and off for a few years. Phelps finishes his six-month suspension from USA swimming next month following his second drunken driving arrest in October.

TODAY'S VIDEO: Who's tough enough to take down Headless on Sleepy Hollow?