diff --git a/ChangeLog b/ChangeLog
index d74def0959..f10061fa07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-08  Robert Love  <rml@novell.com>
+
+	* src/NetworkManagerDevice.c: We want to fall back on and default to
+	  IW_MODE_AUTO, not -1, which is more in line with our previous
+	  behavior.  Otherwise, we try to set the wireless mode to -1 in
+	  nm_device_set_mode().
+
 2005-12-07  Robert Love  <rml@novell.com>
 
 	* gnome/applet/applet-dbus-info.c, include/NetworkManager.h,
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index f93f22d824..bca7d1bf8a 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -1926,7 +1926,7 @@ static gboolean nm_device_bring_down_wait (NMDevice *dev, gboolean cancelable)
 int nm_device_get_mode (NMDevice *dev)
 {
 	NMSock *	sk;
-	int		mode = -1;
+	int		mode = IW_MODE_AUTO;
 
 	g_return_val_if_fail (dev != NULL, -1);
 	g_return_val_if_fail (nm_device_is_802_11_wireless (dev), -1);
@@ -1967,7 +1967,7 @@ gboolean nm_device_set_mode (NMDevice *dev, const int mode)
 
 	g_return_val_if_fail (dev != NULL, FALSE);
 	g_return_val_if_fail (nm_device_is_802_11_wireless (dev), FALSE);
-	g_return_val_if_fail ((mode == IW_MODE_INFRA) || (mode == IW_MODE_ADHOC), FALSE);
+	g_return_val_if_fail ((mode == IW_MODE_INFRA) || (mode == IW_MODE_ADHOC) || (mode == IW_MODE_AUTO), FALSE);
 
 	if (nm_device_get_mode (dev) == mode)
 		return TRUE;