Both People magazine and the gossip website TMZ are reporting the reconciliation this morning as the two music stars have been seen together hanging out at one of Diddy's homes on Star Island in Miami Beach.
It was nearly weeks that Brown, 19, put the smack down on Rihanna on February 8, causing both of them to miss the Grammy Awards show and her to return to Barbados to heal.
"They're together again. They care for each other," a source told People exclusively.
Adds the source: "While Chris is reflective and saddened about what happened, he is really happy to be with the woman he loves."
Brown had been booked in LA on a charge of making a criminal threat but it's likely he won't be charged with assault if Rihanna refuses to testify against him and it sounds like she won't now.