Rwanda has announced that its main border with Uganda, closed in 2019, will reopen on Monday.
Cross-border movement of people and goods at the Gatuna-Katuna border was halted following tensions between the two East African nations.
Produce has only been allowed to pass through two smaller border posts at Cyanika and Kagitumba.
The reopening was announced after Lt-Gen Muhoozi Kainerugaba, the son of Ugandan President Yoweri Museveni, went to meet Rwandan President Paul Kagame over the weekend.
Rwanda had accused Uganda of arresting and deporting its citizens and supporting rebels from the Democratic Forces for the Liberation of Rwanda (FDLR).
The Ugandan government denied the allegations - and accused Rwanda of infiltrating its security agencies.
On Tuesday, Uganda sacked the head of military intelligence Maj Gen Abel Kandiho, who Rwanda had accused of working with its dissidents.
The reopening of the main border and the sacking of the official mark a significant thawing in relations.