Yes it came with both, all you need to install. Well after a rain delay finally got all 3 birds, nimiq 91 and dtv 3 at 100% on transponder 11 and nimiq 2 at 93% on same transponder.
I did have a superdish to use instead of the dish that came in with the 6120 but a friend of a friend of a friend wanted the superdish for his 921 set-up so I sold it to him.