diff --git a/src/nm-manager.c b/src/nm-manager.c
index 981e57498d..23661a5079 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -2011,6 +2011,12 @@ platform_link_added (NMManager *self,
 			 */
 			break;
 
+		case NM_LINK_TYPE_OLPC_MESH:
+		case NM_LINK_TYPE_WIFI:
+		case NM_LINK_TYPE_WIMAX:
+			nm_log_info (LOGD_HW, "(%s): '%s' plugin not available; creating generic device",
+			             plink->name, plink->type_name);
+			/* fall through */
 		default:
 			device = nm_device_generic_new (plink);
 			break;