diff --git a/html/images/os/netopia.png b/html/images/os/netopia.png
new file mode 100644
index 000000000..bfe5b59f5
Binary files /dev/null and b/html/images/os/netopia.png differ
diff --git a/includes/osdiscovery/discover-netopia.php b/includes/osdiscovery/discover-netopia.php
new file mode 100644
index 000000000..68c15ec32
--- /dev/null
+++ b/includes/osdiscovery/discover-netopia.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+
+  if (preg_match("/^Netopia /", $sysDescr)) { $os = "netopia"; }
+
+}
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index f2faba7f8..b9678686a 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -105,6 +105,9 @@ $config['os']['powervault']['text']     = "Dell PowerVault";
 
 $config['os']['drac']['text']           = "Dell DRAC";
 
+$config['os']['netopia']['text']        = "Motorola Netopia";
+$config['os']['netopia']['type']        = "network";
+
 $config['os']['axiscam']['text']        = "AXIS Network Camera";
 
 $config['os']['gamatronicups']['text']  = "Gamatronic UPS Stack";