A second suspect in the murder of rapper XXXTentacion was arrested, Florida authorities said Wednesday.

Michael Boatwright, 22, was the one of the two suspects who approached the rapper, whose real name was Jahseh Onfroy, and shot him when he was leaving the Riva Motorsports shop in Deerfield Beach, north of Miami on June 18, the Broward County Sheriff’s Office said.

The suspect was first arrested on drug-related charges on July 5 and served with an arrest warrant on Tuesday for first-degree murder while being held at Broward Sheriff’s Office Main Jail, the sheriff's office said.

The first arrest in this investigation was made on June 21 when Florida police pulled over Dedrick Williams, 22, and charged him with first-degree murder without premeditation, a probation violation and with failing to have a valid driver's license.

Onfroy, 20, gained fame after his single, “Look at Me” — climbed to No. 34 on the Billboard Hot 100. A few months later, he reportedly secured a $6 million record deal with a Capitol Music Group subsidiary.

But the rapper’s brief rise was also checkered with controversy. In 2016, Onfroy was arrested numerous times including domestic abuse against his pregnant girlfriend.

Later, he faced more charges including witness tampering.