Afeni Shakur's death elicited great sadness in the music community, as well as a nearly equal level of concern over what would become of Tupac's estate, which she had dutifully had managed for nearly 20 years.

Fortunately, it looks like there is nothing to worry about. According to TMZ, Shakur took the necessary steps to ensure that her son's estate would be in the right hands before she passed away.

Shakur set up a trust that will control all rights to Tupac's music. Tom Whalley's, the former head of Warner Bros. Records, agreed to be the executor of the trust.

The estimated $900,000 that Tupac's estate earns annually will go to select charities and family members. Afeni is survived by her sister, Gloria, and her daughter, Sekyiwa Shakur. The trust did not name Gust Davis, Shakur's ex-husband who sought a share of Tupac's estate as alimony.

It appears that Tupac's music and legacy is good hands. Learn more about Afeni Shakur here and read the Shakur's official statement regarding her death below.