pgpass (in)flexibility

We're in a situation where we would like to take advantage of the pgpass hostname field to determine which password
getsused. For example: 

psql -h prod-server -d foo # should use the prod password
psql -h beta-server -d foo # should use the beta password

This would *seem* to be simple, just put "prod-server" or "beta-server" into the hostname field of .pgpass. But if
somebodyuses the FQDN of those hosts, then the line does not match. If somebody uses the IP address of those hosts,
again,no match. It seems that the hostname must match the hostname *exactly* - or match any host ("*"), which does not
workfor our use case. 

This seems to make the hostname field unnecessarily inflexible. Has anybody else experienced - and hopefully overcome -
thispain? Maybe I'm just going about it all wrong.