diff --git a/wicd/networking.py b/wicd/networking.py
index aad0633..0ea258e 100644
--- a/wicd/networking.py
+++ b/wicd/networking.py
@@ -448,6 +448,8 @@ class ConnectThread(threading.Thread):
         else:
             # Run dhcp...
             self.SetStatus('running_dhcp')
+            if self.network.get('dhcphostname') == None:
+                self.network['dhcphostname'] = os.uname()[1]
             print "Running DHCP with hostname",self.network["dhcphostname"]
             dhcp_status = iface.StartDHCP(self.network["dhcphostname"])
             if dhcp_status in ['no_dhcp_offers', 'dhcp_failed']:
diff --git a/wicd/wnettools.py b/wicd/wnettools.py
index 43eb341..1cf8568 100644
--- a/wicd/wnettools.py
+++ b/wicd/wnettools.py
@@ -328,6 +328,8 @@ class BaseInterface(object):
             return ""
             
         if flavor == "connect":
+            if not hostname:
+                hostname = os.uname()[1]
             return client_dict[client_name]['connect'] % \
                     { "cmd" : cmd,
                       "iface" : self.iface,