Ethiopian journalist Addisalem Hadigu hopes to see his Eritrean wife and two daughters for the first time in 16 years.
It comes after the leaders of the two nations signed a declaration, ending the “state of war” which has existed since their armies fought for territory between 1999 and 2000.
Road and air links between the two neighbours are expected to reopen in the next few days, while phone lines have already been restored.
Addisalem told BBC Tigrinya's Hana Zeratsyon how the conflict destroyed his marriage and split up his family:
I lost two of my younger brothers in the war that claimed the lives of tens of thousands of people.
It made families, including mine, see each other as enemies.
I married an Eritrean, Mitslal Abrha Dirar, in 1980, when we were both 20.
In 2002, two years after the end of the border war, my wife left me – taking our two daughters with her to Eritrea. I have not seen any of them since.
As an Eritrean citizen, my wife had lost her right to work as a teacher in Ethiopia. I was worried that she would be sent back to Eritrea.
So, I helped her get an official document from Ethiopia's Ministry of Foreign Affairs, stating that she was married to an Ethiopian and could therefore remain in the country.