diff --git a/html/images/os/routeros.png b/html/images/os/routeros.png
new file mode 100644
index 000000000..c97925c2d
Binary files /dev/null and b/html/images/os/routeros.png differ
diff --git a/includes/osdiscovery/discover-routeros.php b/includes/osdiscovery/discover-routeros.php
new file mode 100644
index 000000000..1f419ef21
--- /dev/null
+++ b/includes/osdiscovery/discover-routeros.php
@@ -0,0 +1,12 @@
+<?php
+
+if(!$os) {
+
+       if ($sysDescr == "router") {
+               if (is_numeric(snmp_get($device, "SNMPv2-SMI::enterprises.14988.1.1.4.3.0", "-Oqv", ""))) {
+                       $os = "routeros";
+               }
+       }
+}
+
+?>
diff --git a/includes/polling/device-routeros.inc.php b/includes/polling/device-routeros.inc.php
new file mode 100644
index 000000000..6464d41a1
--- /dev/null
+++ b/includes/polling/device-routeros.inc.php
@@ -0,0 +1,6 @@
+<?php
+
+$version = trim(snmp_get($device, "1.3.6.1.4.1.14988.1.1.4.4.0", "-OQv", "", ""),'"');
+$version .= " Level " . trim(snmp_get($device, "1.3.6.1.4.1.14988.1.1.4.3.0", "-OQv", "", ""),'"');
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index caf6aabdb..b567a90bc 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -77,6 +77,9 @@ $config['os']['junos']['type']		= "network";
 $config['os']['screenos']['text']	= "Juniper ScreenOS";
 $config['os']['screenos']['type']	= "firewall";
 
+$config['os']['routeros']['text']	= "Mikrotik RouterOS";
+$config['os']['routeros']['type']	= "network";
+
 $config['os']['junose']['text']		= "Juniper JunOSe";
 $config['os']['junose']['type']		= "network";