A body recovered off the coast of Dunbar is believed to be missing Fife diver William Peace.
Mr Peace, of Markinch, failed to resurface while diving on July 8.
The 59-year-old was a member of an organised party at the site of a First World War U-boat wreck around three miles into the North Sea.
A Police Scotland spokesman said: “Police in East Lothian were assisted by colleagues from the Royal Navy and RNLI in recovering the body of a 59-year-old man from the water off the coast of Dunbar on Wednesday August 30.
“There are no suspicious circumstances surrounding this death and a report will be sent to the Procurator Fiscal.”
The alarm was raised when Mr Peace failed to return and an extensive search involving the police, Dunbar RNLI and the UK Coastguard was launched.
A search and rescue helicopter joined emergency services and a local vessel, Conserver, in conducting a search of the water surrounding the U-boat wreck. However, this operation stopped after three hours.
Help was also requested from the Royal Navy.
Mr Peace is understood to have had around 30 years of diving experience, with several photographs on social media capturing him underwater.