diff --git a/ChangeLog b/ChangeLog
index 6087d7c87d..637e29cbd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-19  Dan Williams  <dcbw@redhat.com>
+
+	* system-settings/plugins/ifcfg-fedora/reader.c
+		- (make_ip4_setting): get a fallback gateway from /etc/sysconfig/network
+			if the ifcfg doesn't specify one
+
 2008-05-19  Dan Williams  <dcbw@redhat.com>
 
 	Make the system settings service exit when the bus goes away.  Since it's
diff --git a/system-settings/plugins/ifcfg-fedora/reader.c b/system-settings/plugins/ifcfg-fedora/reader.c
index 9bb47d3836..5e488d832f 100644
--- a/system-settings/plugins/ifcfg-fedora/reader.c
+++ b/system-settings/plugins/ifcfg-fedora/reader.c
@@ -182,6 +182,19 @@ make_ip4_setting (shvarFile *ifcfg, GError **error)
 	if (*error)
 		goto error;
 
+	/* If no gateway in the ifcfg, try /etc/sysconfig/network instead */
+	if (!tmp.gateway) {
+		shvarFile *network;
+
+		network = svNewFile ("/etc/sysconfig/network");
+		if (network) {
+			get_one_ip4_addr (network, "GATEWAY", &tmp.gateway, error);
+			svCloseFile (network);
+			if (*error)
+				goto error;
+		}
+	}
+
 	get_one_ip4_addr (ifcfg, "NETMASK", &tmp.netmask, error);
 	if (*error)
 		goto error;