diff --git a/NetworkManager.spec b/NetworkManager.spec
index 475d476..040c776 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -18,7 +18,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0.99
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -30,6 +30,7 @@ Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
 Patch3: NetworkManager-0.7.1-localhost-localdomain.patch
 Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch
+Patch5: missing-onboot-equals-yes.patch
 Patch10: old-dbus-glib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,7 +52,7 @@ Obsoletes: dhcdbd
 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1
 Conflicts: NetworkManager-pptp < 1:0.7.0.99-1
-Conflicts: NetworkManager-openconnect < 1:0.7.0.99-1
+Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -152,6 +153,7 @@ tar -xjf %{SOURCE1}
 %patch2 -p1 -b .explain-dns1-dns2
 %patch3 -p1 -b .keep-localhost-localdomain
 %patch4 -p1 -b .fix-hal-resync
+%patch5 -p1 -b .missing-onboot
 %patch10 -p1 -b .old-dbus-glib
 
 %build
@@ -336,6 +338,9 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Mon Mar  9 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-3
+- Missing ONBOOT should actually mean ONBOOT=yes (rh #489422)
+
 * Mon Mar  9 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-2
 - Fix conflict with NetworkManager-openconnect (rh #489271)
 - Fix possible crash when resynchronizing devices if HAL restarts
diff --git a/missing-onboot-equals-yes.patch b/missing-onboot-equals-yes.patch
new file mode 100644
index 0000000..ca17b7e
--- /dev/null
+++ b/missing-onboot-equals-yes.patch
@@ -0,0 +1,15 @@
+diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c
+--- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal	2009-03-09 23:02:38.000000000 -0400
++++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c	2009-03-09 23:22:57.000000000 -0400
+@@ -132,9 +132,9 @@ make_connection_setting (const char *fil
+ 	              NULL);
+ 	g_free (uuid);
+ 
+-	/* Be somewhat conservative about autoconnect */
++	/* Missing ONBOOT is treated as "ONBOOT=true" by the old network service */
+ 	g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT,
+-	              svTrueValue (ifcfg, "ONBOOT", FALSE),
++	              svTrueValue (ifcfg, "ONBOOT", TRUE),
+ 	              NULL);
+ 
+ 	value = svGetValue (ifcfg, "LAST_CONNECT", FALSE);