diff --git a/ChangeLog b/ChangeLog
index 319cd93cb1..e3d575b697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-31  Robert Love  <rml@novell.com>
+
+	* src/NetworkManagerAP.c: Add two new manufacturer default network
+	  names: linksys-a and linksys-g.  These are found (at least) on the
+	  Linksys WAP55AG, which does both 802.11a and 802.11b, each with their
+	  own ESSID.
+
 2006-01-31  Robert Love  <rml@novell.com>
 
 	* src/NetworkManagerAP.c: Optimize the function
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index 358a8d3e12..ba5735ee38 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -60,6 +60,8 @@ struct NMAccessPoint
 static const char * default_essid_list[] =
 {
 	"linksys",
+	"linksys-a",
+	"linksys-g",
 	"default",
 	"belkin54g",
 	"NETGEAR",