Extended whois

Occasionaly my mobile geeks call me from a client's premises and want me to do a whois for their domains. The Deb/GNU whois I have doesn't show the MX records, only the DNS. Most of the time they are messing with MX for exchange servers. Is there a different command/options I should be using to get this extra info that you can see on some of the web based lookups?

The man page and --help weren't any. :O