diff --git a/html/images/os/riverbed.png b/html/images/os/riverbed.png
new file mode 100644
index 000000000..51804d52b
Binary files /dev/null and b/html/images/os/riverbed.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 64b0f3805..d8a4a12f0 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1331,6 +1331,14 @@ $config['os'][$os]['icon']             = 'hp';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// Riverbed
+$os = 'riverbed';
+$config['os'][$os]['text']             = 'Riverbed';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'riverbed';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 // Appliances
 $os = 'fortios';
 $config['os'][$os]['text']             = 'FortiOS';
diff --git a/includes/discovery/os/riverbed.inc.php b/includes/discovery/os/riverbed.inc.php
new file mode 100644
index 000000000..f97e68fd8
--- /dev/null
+++ b/includes/discovery/os/riverbed.inc.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
+ * 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 (strpos($sysObjectId, '1.3.6.1.4.1.17163.1.1') !== false) {
+        $os = 'riverbed';
+    }
+}
diff --git a/includes/polling/os/riverbed.inc.php b/includes/polling/os/riverbed.inc.php
new file mode 100644
index 000000000..2cc99e319
--- /dev/null
+++ b/includes/polling/os/riverbed.inc.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
+ * 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.
+ */
+$hardware = trim(snmp_get($device, '.1.3.6.1.4.1.17163.1.1.1.1.0', '-OQv'), '"');
+$serial   = trim(snmp_get($device, '.1.3.6.1.4.1.17163.1.1.1.2.0', '-OQv'), '"');
+$version  = trim(snmp_get($device, '.1.3.6.1.4.1.17163.1.1.1.3.0', '-OQv'), '"');