The army and rebels in Ivory Coast have agreed to begin disarming at the end of June, and to set up a new republican army with fighters from both sides.
The disarmament is already behind schedule
The agreement came after two weeks of talks in the capital, Yamoussoukro.
Head of the national disarmament committee Alain Donwahi said he expects disarmament and demobilisation to be completed by 10 August.
Ivory Coast has been in crisis since 2002 when rebel forces seized the north of the country.
The talks follow a peace deal signed in South Africa in April between the army and rebels.
Both sides began pulling back heavy weapons from front-line areas shortly after the agreement.
"I am very satisfied... I am hopeful for the future," army chief Philippe Mangou told correspondents after the negotiations.
"We have decided to make peace between the two sides and that is why we have signed," said Morou Ouattara, a rebel commander.
Mr Donwahi said almost enough money had been pledged to begin the demobilisation.
The World Bank is paying almost half of the $150m (£81m) needed for the process.
However, the disarmament is already behind schedule.
The peace deal brokered by South African President Thabo Mbeki called for the handing over of weapons to start by mid-May.
Disarmament was originally part of a French-brokered accord signed in January 2003
Presidential elections are due to be held in the country in October this year.