diff --git a/ChangeLog b/ChangeLog
index 967effdb2..9237acda1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-11  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-dhcp-manager.c
+		- (nm_dhcp_manager_get_ip4_config): if for some reason we don't get
+			an gateway returned from DHCP, try to use the address of the DHCP
+			server as the gateway instead.  Found by Ralf Ertzinger.
+
 2005-08-10  Robert Love  <rml@novell.com>
 
 	* gnome/applet/applet.c: Make applet->dbus_thread joinable so we can
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index c0f872034..09a43b92c 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -479,7 +479,11 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque
 		goto out;
 
 	if (!get_ip4_uint32s (manager, dev, "routers", &ip4_gateway, &count) || !count)
-		goto out;
+	{
+		/* If DHCP doesn't have a 'routers', just use the DHCP server's address as our gateway for now */
+		if (!get_ip4_uint32s (manager, dev, "dhcp_server_identifier", &ip4_gateway, &count) || !count)
+			goto out;
+	}
 
 	if (!get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers) || !num_ip4_nameservers)
 		goto out;