Mel Gibson’s ex-girlfriend, Russian-born singer, songwriter Oksana Grigorieva, have reached a settlement of their bitterly fought separation and custody dispute over their young daughter.

Los Angeles Superior Court officials said in a statement that Gibson and Grigorieva had settled their dispute after days of negotiation.

Terms and conditions of the settlement were not divulged, but further hearing will be set on Wednesday, August 31, to discuss the monetary terms.

It was not immediately clear whether the custody deal between Gibson and Oksana Grigorieva over their daughter Lucia settled all of the legal problems between the two. Gibson’s spokesman declined further comment.

The former couple have fought for more than a year over custody and monetary issues in a confidential court proceeding in Los Angeles.

Gibson has alleged Grigorieva tried to extort money from him beyond a reported $20 million settlement that resulted from their breakup by using a series of audiotapes of insults and a racial slurs hurled at her over the telephone.

Gibson was charged with misdemeanor domestic battery as a result of a January 2010 fight with Grigorieva and pleaded no contest earlier this year. The actor-director entered his plea in a way in which he admitted no guilt, and and was sentenced to three years probation.

He was ordered by the court to undergo counseling and recently completed his community service by volunteering with a children’s charity in Guatemala.