After updating your Zune client software to version 2.5, once you dock your Zune again, the software will prompt you to update the firmware on the Zune device itself before you can continue using the Zune software.
I'm updating right now -- and it looks like it doesn't take long at all.
After 3 device reboots, all good.
