diff --git a/html/images/os/3com.png b/html/images/os/3com.png
index 6b0155a17..7f2e3a10a 100644
Binary files a/html/images/os/3com.png and b/html/images/os/3com.png differ
diff --git a/html/images/os/airport.png b/html/images/os/airport.png
new file mode 100644
index 000000000..04eaae30f
Binary files /dev/null and b/html/images/os/airport.png differ
diff --git a/html/images/os/zywall.png b/html/images/os/zywall.png
index 2e1f0989b..28d9964e4 100644
Binary files a/html/images/os/zywall.png and b/html/images/os/zywall.png differ
diff --git a/includes/static-config.php b/includes/static-config.php
index 779a51d45..c08c90fd0 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -97,6 +97,9 @@ $config['os']['powerconnect']['text']   = "Dell PowerConnect";
 $config['os']['powerconnect']['ifname'] = 1;
 $config['os']['powerconnect']['type']   = "network";
 
+$config['os']['airport']['type'] 	= "network";
+$config['os']['airport']['text']  	= "Apple AirPort";
+
 $config['os']['windows']['text']        = "Microsoft Windows";
 $config['os']['windows']['ifname']	= 1;
 
diff --git a/poller.php b/poller.php
index 2c97c1e41..f027ebbae 100755
--- a/poller.php
+++ b/poller.php
@@ -86,7 +86,7 @@ while ($device = mysql_fetch_array($device_query)) {
     mysql_query("UPDATE `devices` SET `status` = '".$status."' WHERE `device_id` = '".$device['device_id']."'");
     mysql_query("INSERT INTO alerts (importance, device_id, message) VALUES ('0', '" . $device['device_id'] . "', 'Device is " .($status == '1' ? 'up' : 'down') . "')");
     log_event('Device status changed to ' . ($status == '1' ? 'Up' : 'Down'), $device['device_id'], ($status == '1' ? 'up' : 'down'));
-    alert($device, "Device ".($status == '1' ? 'Up' : 'Down').": " . $device['hostname'], "Device ".($status == '1' ? 'up' : 'down').": " . $device['hostname'] . " at " . date($config['timestamp_format']));
+    notify($device, "Device ".($status == '1' ? 'Up' : 'Down').": " . $device['hostname'], "Device ".($status == '1' ? 'up' : 'down').": " . $device['hostname'] . " at " . date($config['timestamp_format']));
   }
 
   if ($status == "1")