Archibald Hunter, known locally as Archie, had last been seen leaving an address in Earl Haig Gardens, Trinity, around 12:30pm today.
There were growing concerns for Mr Hunter's welfare.
But police confirmed just before 9pm the missing 47-year-old had been found safe and well.
"Thank you for those who shared our appeal," a Police Scotland tweet said.