diff --git a/html/images/logos/siemens.svg b/html/images/logos/siemens.svg
new file mode 100644
index 0000000000..60d1452542
--- /dev/null
+++ b/html/images/logos/siemens.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="svg22" viewBox="0 0 195.72321 31.140699" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision"><defs id="defs4"><style id="style2"><![CDATA[
+    .fil0 {fill:#009999}
+   ]]></style></defs><g id="Ebene_x0020_1" fill="#099"><path id="path7" d="M193.43 1.1V6.9c-3.02-1.14-5.7-1.7-8.06-1.7-1.4 0-2.5.24-3.34.74-.83.5-1.26 1.13-1.26 1.86 0 .97.95 1.83 2.84 2.6l5.5 2.67c4.43 2.1 6.62 4.9 6.62 8.43 0 2.93-1.16 5.27-3.52 7-2.33 1.75-5.48 2.6-9.4 2.6-1.8 0-3.42-.07-4.86-.23-1.44-.15-3.1-.47-4.93-.93v-6.1c3.37 1.14 6.44 1.72 9.2 1.72 3.3 0 4.94-.97 4.94-2.9 0-.95-.67-1.73-2.04-2.34l-6.08-2.6c-2.25-1-3.92-2.23-5-3.7-1.1-1.46-1.63-3.15-1.63-5.08 0-2.7 1.12-4.87 3.37-6.52 2.26-1.64 5.26-2.46 9-2.46 1.2 0 2.6.1 4.16.3 1.56.22 3.06.47 4.5.8z" class="fil0"/><path id="path9" d="M21.04 1.1V6.9c-3.02-1.14-5.7-1.7-8.06-1.7-1.4 0-2.5.24-3.34.74-.83.5-1.26 1.13-1.26 1.86 0 .97.95 1.83 2.85 2.6l5.48 2.67c4.43 2.1 6.63 4.9 6.63 8.43 0 2.93-1.17 5.27-3.5 7-2.36 1.75-5.5 2.6-9.42 2.6-1.8 0-3.42-.07-4.86-.23-1.44-.15-3.08-.47-4.93-.93v-6.1C4 25 7.07 25.6 9.8 25.6c3.3 0 4.94-.97 4.94-2.9 0-.95-.67-1.73-2.02-2.34l-6.1-2.6c-2.25-1-3.92-2.23-5-3.7C.53 12.6 0 10.92 0 9c0-2.7 1.13-4.87 3.4-6.52C5.62.82 8.63 0 12.36 0c1.23 0 2.6.1 4.17.3 1.55.22 3.05.47 4.5.8z" class="fil0"/><path id="polygon11" class="fil0" d="M27.32.55h8.92V30.6h-8.92z"/><path id="polygon13" class="fil0" d="M63.24 12.76v5h-11.5v7h13.53v5.83H43.15V.54H65V6.1H51.74v6.66z"/><path id="polygon15" class="fil0" d="M89.7 30.87h-5.15l-8.32-20.1V30.6H70.2V.54h10.9l7.44 18.4L96.32.54h10.35V30.6h-8.33V10.77z"/><path id="polygon17" class="fil0" d="M133.73 12.76v5h-11.5v7h13.46v5.83h-22.14V.54h21.86V6.1h-13.2v6.66z"/><path id="polygon19" class="fil0" d="M146.64 30.6h-6.02V.54h9.75l10.35 18.94V.54h6.02V30.6h-9.47L146.64 11.3z"/></g></svg>
\ No newline at end of file
diff --git a/html/images/os/siemens.svg b/html/images/os/siemens.svg
new file mode 100644
index 0000000000..70e1882b9c
--- /dev/null
+++ b/html/images/os/siemens.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8.4666662 8.4666659" id="svg22" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision"><defs id="defs4"><style id="style2"><![CDATA[
+    .fil0 {fill:#009999}
+   ]]></style></defs><g id="Ebene_x0020_1" fill="#099"><path class="fil0" d="M8.4 2.5v.72c-.14-.14-.26-.2-.36-.2-.06 0-.1.02-.15.08-.04.06-.06.13-.06.22 0 .12.04.23.12.32l.24.32c.2.26.3.6.3 1.02 0 .36-.06.64-.17.85-.1.2-.23.32-.4.32-.08 0-.15 0-.2-.03-.08-.02-.15-.06-.23-.1v-.75c.15.14.28.2.4.2.14 0 .2-.1.2-.34 0-.12 0-.2-.07-.3l-.27-.3c-.1-.12-.17-.27-.2-.45-.06-.18-.08-.38-.08-.62 0-.32.05-.6.14-.8.1-.18.23-.28.4-.28.04 0 .1 0 .17.03l.2.1z" id="path7"/><path class="fil0" d="M.93 2.5v.72c-.13-.14-.25-.2-.35-.2-.06 0-.1.02-.14.08-.04.06-.06.13-.06.22 0 .12.04.23.13.32l.24.32c.2.26.3.6.3 1.02 0 .36-.06.64-.16.85-.1.2-.24.32-.4.32-.1 0-.16 0-.22-.03l-.2-.1v-.75c.13.14.27.2.38.2.15 0 .22-.1.22-.34 0-.12-.03-.2-.1-.3l-.25-.3C.2 4.4.15 4.26.1 4.08.03 3.9 0 3.7 0 3.46c0-.32.05-.6.15-.8.1-.18.22-.28.38-.28.06 0 .12 0 .2.03.05.04.12.07.18.1z" id="path9"/><path class="fil0" id="polygon11" d="M1.6 2.44v3.64h-.4V2.44z"/><path class="fil0" id="polygon13" d="M2.84 6.08H1.9V2.44h.93v.68h-.57v.8h.5v.6h-.5v.86h.58z"/><path class="fil0" id="polygon15" d="M3.06 6.08V2.44h.47l.32 2.23.34-2.23h.43v3.64h-.36v-2.4L3.9 6.12h-.22l-.36-2.44v2.4z"/><path class="fil0" id="polygon17" d="M5.9 6.08h-.97V2.44h.95v.68H5.3v.8h.5v.6h-.5v.86h.6z"/><path class="fil0" id="polygon19" d="M7.23 6.08h-.4l-.47-2.33v2.33H6.1V2.44h.42l.45 2.3v-2.3h.26z"/></g></svg>
\ No newline at end of file
diff --git a/includes/definitions/ros.yaml b/includes/definitions/ros.yaml
new file mode 100644
index 0000000000..d30826e0c1
--- /dev/null
+++ b/includes/definitions/ros.yaml
@@ -0,0 +1,8 @@
+os: ros
+text: 'Siemens Ruggedcom Switches (ROS)'
+type: network
+empty_ifdescr: 1
+icon: siemens
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.15004.2.1
diff --git a/includes/polling/os/ros.inc.php b/includes/polling/os/ros.inc.php
new file mode 100644
index 0000000000..742de9cbad
--- /dev/null
+++ b/includes/polling/os/ros.inc.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * ros.inc.php
+ *
+ * LibreNMS os poller module for Siemens Ruggedcom Switches
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2017 Lorenzo Zafra
+ * @author     Lorenzo Zafra<zafra@ualberta.ca>
+ */
+
+preg_match('~(?\'hardware\'.*?)-(?:.*)~', $poll_device['sysDescr'], $matches);
+
+if ($matches['hardware']) {
+    $hardware = $matches['hardware'];
+}
+
+$version = trim(snmp_get($device, '.1.3.6.1.4.1.15004.4.2.3.3.0', '-Ovq'), '"');
+$serial = trim(snmp_get($device, '.1.3.6.1.4.1.15004.4.2.3.1.0', '-Ovq'), '"');
diff --git a/tests/snmpsim/ros.snmprec b/tests/snmpsim/ros.snmprec
new file mode 100644
index 0000000000..0eed3e5e4b
--- /dev/null
+++ b/tests/snmpsim/ros.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|RS900-24-D-T2-T2-T2
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.15004.2.1