I am fairly new to networking and Ubuntu. With that said, I have setup a server (Ubuntu 10.10 I believe) and configured PPP to work. I am using a laptop with Ubuntu 11.10 I believe on it. I can connect to VPN and have some static routes setup so I can ping 192.168.0.XX on my network but all other Internet traffic goes to the Internet.

My issue is that I have installed avahi on the server and when I am at home I can reach systems on the network with [Server Name].local just fine. But when I connect to VPN I have to use the IP to connect. How is the best way to accomplish this without adding the names manually to my Hosts file?