DHCP, WINS, Samba and no DNS: A tricky combination

At least it's tricky for me...

The system I'm using is Lunix Red Hat 6.1 for i386
Samba version 2.0.5a-12 (the version number in the RPM file name)

I have to use DHCP and I want to connect Samba to a WINS-server (I don't want Samba to be the WINS-server). It looked like it was working OK in the beginning, but after a while I realized that Samba had registered my computer in the WINS-server with the IP-address 127.0.0.1... this is no
good. I got a tip from a friend of mine who said that I should use the 'interface =' option in the smb.conf file. But in order to do that I have to type in my IP-address... I can't do that because I'm using DHCP.

It seems to me that Samba is doing a DNS lookup in order to get the IP-address, because when I remove the name of my computer from the hosts file (the name is an alias for 127.0.0.1), Samba can't find the IP-address.

My soultion to this problem is currently to first boot up the computer, then check the IP, type in the IP and the computer name in the /etc/hosts file and after that start Samba.
It works, but.....

I really hope someone out there got a better solution...