Ziggy 5.1 bonus dvd

Just to make sure, If I buy the cd version of the just released remaster of ZS I only got ONE cd and if I order the vinyl version i will get a bonus dvd with the 5.1 ziggy and some bonus songs? Or will there be a cd set with all the music as well?

I am sure it was discussed before here on the boards, however I am not able to find the discussion anymore!