diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index ba0c50232..098670199 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -786,6 +786,13 @@ $config['os'][$os]['icon']             = 'ibmnos';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+$os = 'ibmtapelibrary';
+$config['os'][$os]['text']             = 'IBM Tape Library';
+$config['os'][$os]['type']             = 'storage';
+$config['os'][$os]['icon']             = 'generic';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Traffic';
+
 $os = 'comware';
 $config['os'][$os]['text']             = 'HP Comware';
 $config['os'][$os]['type']             = 'network';
diff --git a/includes/discovery/os/ibmtapelibrary.inc.php b/includes/discovery/os/ibmtapelibrary.inc.php
new file mode 100644
index 000000000..1730c0df3
--- /dev/null
+++ b/includes/discovery/os/ibmtapelibrary.inc.php
@@ -0,0 +1,17 @@
+<?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 (strstr($sysObjectId, '.1.3.6.1.4.1.2.6.182.1.0.401.1')) {
+        $os = 'ibmtapelibrary';
+    }
+}
diff --git a/includes/polling/os/ibmtapelibrary.inc.php b/includes/polling/os/ibmtapelibrary.inc.php
new file mode 100644
index 000000000..f20a56798
--- /dev/null
+++ b/includes/polling/os/ibmtapelibrary.inc.php
@@ -0,0 +1,15 @@
+<?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.14851.3.1.4.2.0", "-Ovq") , '" ');
+$serial = trim(snmp_get($device, ".1.3.6.1.4.1.14851.3.1.3.2.0", "-Ovq") , '" ');
+$version = trim(snmp_get($device, ".1.3.6.1.4.1.14851.3.1.3.4.0", "-Ovq") , '" ');