diff --git a/html/images/os/meraki.png b/html/images/os/meraki.png
new file mode 100644
index 000000000..51b3564f6
Binary files /dev/null and b/html/images/os/meraki.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 3c551d571..6b7532349 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1189,6 +1189,31 @@ foreach ($config['os'] as $this_os => $blah)
   }
 }
 
+// Meraki
+$os = "merakimx";
+$config['os'][$os]['text']              = "Meraki MX Appliance";
+$config['os'][$os]['type']              = "firewall";
+$config['os'][$os]['icon']              = "meraki";
+$config['os'][$os]['ifname']            = 1;
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+
+$os = "merakimr";
+$config['os'][$os]['text']              = "Meraki AP";
+$config['os'][$os]['type']              = "wireless";
+$config['os'][$os]['icon']              = "meraki";
+$config['os'][$os]['ifname']            = 1;
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+
+$os = "merakims";
+$config['os'][$os]['text']              = "Meraki Switch";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['icon']              = "meraki";
+$config['os'][$os]['ifname']            = 1;
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+
 // Graph Types
 
 include_once($config['install_dir'] . "/includes/load_db_graph_types.inc.php");
diff --git a/includes/discovery/os/merakimr.inc.php b/includes/discovery/os/merakimr.inc.php
new file mode 100644
index 000000000..a8255a6b3
--- /dev/null
+++ b/includes/discovery/os/merakimr.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS Meraki MR detection module
+ *
+ * Copyright (c) 2015 Will Jones <email@willjones.eu>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */    
+
+if (!$os) {
+    if (preg_match("/^Meraki MR/", $sysDescr)) { $os = "merakimr"; }
+}
+
+?>
diff --git a/includes/discovery/os/merakims.inc.php b/includes/discovery/os/merakims.inc.php
new file mode 100644
index 000000000..8635c0e95
--- /dev/null
+++ b/includes/discovery/os/merakims.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS Meraki MS detection module
+ *
+ * Copyright (c) 2015 Will Jones <email@willjones.eu>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */    
+
+if (!$os) {
+    if (preg_match("/^Meraki MS/", $sysDescr)) { $os = "merakims"; }
+}
+
+?>
diff --git a/includes/discovery/os/merakimx.inc.php b/includes/discovery/os/merakimx.inc.php
new file mode 100644
index 000000000..aa0f87e91
--- /dev/null
+++ b/includes/discovery/os/merakimx.inc.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * LibreNMS Meraki MX detection module
+ *
+ * Copyright (c) 2015 Will Jones <email@willjones.eu>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */    
+
+if (!$os) {
+    if (preg_match("/^Meraki MX/", $sysDescr)) { $os = "merakimx"; }
+}
+
+?>
diff --git a/includes/polling/os/merakimr.inc.php b/includes/polling/os/merakimr.inc.php
new file mode 100644
index 000000000..2158f6c25
--- /dev/null
+++ b/includes/polling/os/merakimr.inc.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * LibreNMS Meraki MR polling module
+ *
+ * Copyright (c) 2015 Will Jones <email@willjones.eu>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */    
+
+if(empty($hardware)) {
+  $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
+}
+
+
+?>
diff --git a/includes/polling/os/merakims.inc.php b/includes/polling/os/merakims.inc.php
new file mode 100644
index 000000000..1bfdaedc3
--- /dev/null
+++ b/includes/polling/os/merakims.inc.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * LibreNMS Meraki MS polling module
+ *
+ * Copyright (c) 2015 Will Jones <email@willjones.eu>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */    
+
+if(empty($hardware)) {
+  $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
+}
+
+
+?>
diff --git a/includes/polling/os/merakimx.inc.php b/includes/polling/os/merakimx.inc.php
new file mode 100644
index 000000000..217ca3afc
--- /dev/null
+++ b/includes/polling/os/merakimx.inc.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * LibreNMS Meraki MX polling module
+ *
+ * Copyright (c) 2015 Will Jones <email@willjones.eu>
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */    
+
+if(empty($hardware)) {
+  $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
+}
+
+
+?>