diff --git a/ChangeLog b/ChangeLog
index 28053e331c..c42baa8aa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-03  Robert Love  <rml@novell.com>
+
+	* src/NetworkManagerAP.c: In nm_ap_new(), default new networks to
+	  broadcast == TRUE.  Also, copy broadcast and artificial properties
+	  from source network to destination in nm_ap_copy().
+	* src/nm-device-802-11-wireless.c: Don't set broadcast flag to TRUE,
+	  since we now default new networks to non-hidden.
+
 2006-02-03  Dan Williams  <dcbw@redhat.com>
 
 	* gnome/applet/main.c
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index 23961cc629..d92e87a6ea 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -79,15 +79,11 @@ NMAccessPoint * nm_ap_new (void)
 {
 	NMAccessPoint	*ap;
 	
-	if (!(ap = g_malloc0 (sizeof (NMAccessPoint))))
-	{
-		nm_warning ("nm_ap_new() could not allocate a new user access point info structure.  Not enough memory?");
-		return NULL;
-	}
-
+	ap = g_malloc0 (sizeof (NMAccessPoint));
 	ap->mode = IW_MODE_INFRA;
 	ap->refcount = 1;
 	ap->capabilities = NM_802_11_CAP_PROTO_NONE;
+	ap->broadcast = TRUE;
 
 	return ap;
 }
@@ -122,6 +118,8 @@ NMAccessPoint * nm_ap_new_from_ap (NMAccessPoint *src_ap)
 	new_ap->freq = src_ap->freq;
 	new_ap->rate = src_ap->rate;
 	new_ap->capabilities = src_ap->capabilities;
+	new_ap->artificial = src_ap->artificial;
+	new_ap->broadcast = src_ap->broadcast;
 
 	if (src_ap->security)
 		new_ap->security = nm_ap_security_new_copy (src_ap->security);
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 3612dc67a2..b8df30ff49 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -3149,10 +3149,7 @@ process_scan_results (NMDevice80211Wireless *dev,
 					else if ((strlen (essid) == 8) && (strcmp (essid, "<hidden>") == 0))	/* Stupid ipw drivers use <hidden> */
 						set = FALSE;
 					if (set)
-					{
-						nm_ap_set_broadcast (ap, TRUE);
 						nm_ap_set_essid (ap, essid);
-					}
 					else
 						nm_ap_set_broadcast (ap, FALSE);
 					g_free (essid);