How to set up dnsmasq on PC to mimic router's comfort functions?

I want to move the DNS functionality from my router to a PC running dnsmasq on the network. The basic setup is up and running, but I am missing the following functions the router had implemented:

• hostnames on the devices are automatically used, no /etc/hosts file maintenance necessary
• ability to address devices by their hostname, not only by IP
• assignment of .local domain to all the devices
• works with and without the .local domain, i.e. http://box1 and http://box1.local are both legal and can be used to browse the box1 server
• works with Windows, Android, Linux clients and others

DHCP is still running on the router; an uncommented local=/local/ in /etc/dnsmasq.conf makes dnsmasq look up the names in the router, but only if running linux. A linux box 'box1' can be addressed with box1.local now, but this doesn't work for windows clients. Also not for box1 only, it has to be FQDN.

What do I need to add to /etc/dnsmasq.conf to get the functionality mentioned in the bullet points above?

Recent Questions...