diff --git a/ChangeLog b/ChangeLog
index 1d261e7ab2..2127bcb3bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-12  Dan Williams  <dcbw@redhat.com>
+
+	* system-settings/plugins/ifcfg-fedora/parser.c
+		- (make_ip4_setting): bring IPv4 setting handling more up to spec
+
 2008-02-12  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-util/nm-utils.c
diff --git a/system-settings/plugins/ifcfg-fedora/parser.c b/system-settings/plugins/ifcfg-fedora/parser.c
index 7d8f5d201f..dd4d8d4f81 100644
--- a/system-settings/plugins/ifcfg-fedora/parser.c
+++ b/system-settings/plugins/ifcfg-fedora/parser.c
@@ -274,13 +274,8 @@ make_ip4_setting (shvarFile *ifcfg, GError **error)
 	char *dir;
 
 	value = svGetValue (ifcfg, "BOOTPROTO");
-	if (!value)
-		return NULL;
-
-	if (!strcmp (value, "bootp") || !strcmp (value, "dhcp")) {
+	if (value && (!strcmp (value, "bootp") || !strcmp (value, "dhcp")))
 		manual = FALSE;
-		return NULL;
-	}
 
 	value = svGetValue (ifcfg, "IPADDR");
 	if (value) {