More than two decades after its release, Lenny Kravitz is planning a deluxe edition of his sophomore album, 1991's Mama Said.

The Grammy-winning singer/songwriter has been noted more for his film work lately than his musical career, with solid supporting turns in Precious (2010) and the smash hit The Hunger Games (2012). But Mama Said continued to solidify Kravitz as a unique persona with a bright future ahead of him, the groundwork of which was laid with his 1989 debut, Let Love Rule.

Kravitz's second album was his first to reach the Top 40 in America, and gave him the highest charting single of his career, the sublime "It Ain't Over 'Til It's Over." But, he told Billboard, the album reflects "a crazy time" in his life, one that saw the then-27-year-old musician coping with fame and family (daughter Zoë, mothered by actress Lisa Bonet, was born in 1988; the pair would divorce within years of Mama Said's release). "It was a lot to deal with,” he said. “I ended up kind of going into hibernation, ’cause at that point I went through a pretty serious depression. I just let all these feelings out onto the songs. It was very cathartic for me.”

In addition to those original songs, the double-disc reissue features six non-LP B-sides and 15 unreleased tracks, including rough demos, unreleased remixes of "It Ain't Over" and several unheard songs, including a funk-based tune, "Riding on the Wings of My Lord," and the instrumental "Framed, Lying, Crying."

[youtube=http://www.youtube.com/watch?v=TmENMZFUU_0]

The deluxe Mama Said is out June 5. The track list is after the jump.

Lenny Kravitz, Mama Said: Deluxe Edition (Virgin/EMI 50999 643320 2 4, 2012)

Disc 1: Original LP and bonus material

1. Fields of Joy
2. Always on the Run
3. Stand by My Woman
4. It Ain't Over 'Til It's Over
5. More Than Anything in This World
6. What Goes Around Comes Around
7. The Difference is Why
8. Stop Draggin' Around
9. Flowers for Zoe
10. Fields of Joy (Reprise)
11. All I Ever Wanted
12. When the Morning Turns to Night
13. What the Fuck Are We Saying?
14. Butterfly
15. Light Skin Girl from London
16. I'll Be Around
17. Always on the Run (Instrumental)
18. It Ain't Over Til It's Over (12" Remix Instrumental) *
19. It Ain't Over Til It's Over (12" Extended/Dub version) *

Disc 2: More bonus material

1. Riding on the Wings of My Lord (Rough Demo) *
2. It Ain't Over Til It's Over (Home Demo) *
3. What the Fuck Are We Saying? (Home Demo) *
4. The Difference is Why (Home Demo) *
5. Riding on the Wings of My Lord (Funky Vocal) *
6. Riding on the Wings of My Lord (Instrumental) *
7. Framed, Lying, Crying (Instrumental) *
8. Stand by My Woman (Instrumental) *
9. Stop Draggin' Around (Live in Rotterdam) *
10. Always on the Run (Live in Rotterdam) *
11. Fields of Joy (Live in Rotterdam) *
12. Stand by My Woman (Live in Rotterdam) *
13. More Than Anything in This World (Live in Rotterdam) *
14. Always on the Run (Live in Kawasaki, Japan - July 1991)
15. Stop Draggin' Around (Live in Kawasaki, Japan - July 1991)
16. What the Fuck Are We Saying? (Live in Kawasaki, Japan - July 1991)

Disc 1, Tracks 1-14 released as Virgin Records V2 86209, 1991
Disc 1, Tracks 15 and 17 from "Always on the Run" 12" single - Virgin VUST 34 (U.K.), 1991
Disc 1, Track 16 from "It Ain't Over 'Til It's Over" 12" single - Virgin VUST 43 (U.K.), 1991
Disc 2, Tracks 14 and 16 from "Stand by My Woman" CD single - Virgin VUSCD 45 (U.K.), 1991
Disc 2, Track 15 from "Stand by My Woman" 12" single - Virgin VUST 45 (U.K.), 1991