Two women have been charged with the murder of a man in a flat.
Alexander Duncan, known as Addy, was last seen outside the Marksman Bar in Leith on 16 April.
His body was discovered in a property in Primrose Street three days later.
Police launched an investigation and appealed for any sightings of Mr Duncan, who was 59.
Officers said two women aged 29 and 31 have been arrested and charged with murder.
They are due to appear at Edinburgh Sheriff Court on Tuesday.
Detective Inspector Martin MacLean said: “I would like to thank the public for their patience and cooperation while we carried out inquiries in relation to this incident.”