diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 49cbca6e3..f8a137c4d 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -639,6 +639,13 @@ $config['os'][$os]['over'][1]['text']  = 'CPU Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+$os = 'juniperex2500os';
+$config['os'][$os]['text']             = 'Juniper EX2500';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'junos';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+
 // Pulse Secure OS definition
 $os = 'pulse';
 $config['os'][$os]['text']             = 'Pulse Secure';
diff --git a/includes/discovery/os/juniperex2500os.inc.php b/includes/discovery/os/juniperex2500os.inc.php
new file mode 100644
index 000000000..d00524226
--- /dev/null
+++ b/includes/discovery/os/juniperex2500os.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (strstr($sysObjectId, '.1.3.6.1.4.1.1411.102')) {
+        $os = 'juniperex2500os';
+    }
+}