Index: trunk/dhcp/dhcpserver.py
===================================================================
--- trunk/dhcp/dhcpserver.py	(revision 230)
+++ trunk/dhcp/dhcpserver.py	(revision 252)
@@ -110,7 +110,10 @@
         if ip is None:  #Deactivated?
             return False
-        hostname = nic.machine.name
-        if hostname is not None:
-            hostname += ".servers.csail.mit.edu"
+        if nic.hostname and '.' in nic.hostname:
+            hostname = nic.hostname
+        elif nic.machine.name:
+            hostname = nic.machine.name + '.servers.csail.mit.edu'
+        else:
+            hostname = None
         if ip is not None:
             ip = ipv4(ip)