diff --git a/html/images/os/gandi.png b/html/images/os/gandi.png
new file mode 100644
index 000000000..25f0db3b6
Binary files /dev/null and b/html/images/os/gandi.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index f6a760d6d..2e4cdb8aa 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -228,6 +228,18 @@ $config['os'][$os]['over'][1]['text']  = 'Processor Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+$os = 'pktj';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['group']            = 'unix';
+$config['os'][$os]['text']             = 'Gandi Packet Journey';
+$config['os'][$os]['icon']             = 'gandi';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'Processor Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
+
 // Other Unix-based OSes here please.
 $os = 'freebsd';
 $config['os'][$os]['type']  = 'server';
diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php
index 4d49d25e0..7a48938be 100644
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@@ -50,6 +50,20 @@ if (!$os) {
                 $os = 'airos-af';
             }
         }
+        else if (trim(snmp_get($device, 'GANDI-MIB::rxCounter.0', '-Osqnv', 'GANDI-MIB')) != '') {
+            $os = 'pktj';
+            $pktj_mibs = array (
+               "rxCounter"       => "GANDI-MIB",  // RX Packets
+               "txCounter"       => "GANDI-MIB",  // TX Packets
+               "dropCounter"     => "GANDI-MIB",  // Dropped counters
+               "acldropCounter"  => "GANDI-MIB",  // ACL Dropped counter
+               "ratedropCounter" => "GANDI-MIB",  // Rate Dropped counter
+               "KNIrxCounter"    => "GANDI-MIB",  // KNI RX counter
+               "KNItxCounter"    => "GANDI-MIB",  // KNI TX counter
+               "KNIdropCounter"  => "GANDI-MIB",  // KNI DROP counter
+            );
+            register_mibs($device, $pktj_mibs, "include/discovery/os/linux.inc.php");
+        }
         else {
             // Check for Synology DSM
             $hrSystemInitialLoadParameters = trim(snmp_get($device, 'HOST-RESOURCES-MIB::hrSystemInitialLoadParameters.0', '-Osqnv'));
diff --git a/includes/discovery/sensors/fanspeeds/lmsensors.inc.php b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php
index 8e288e73d..5396eeccb 100644
--- a/includes/discovery/sensors/fanspeeds/lmsensors.inc.php
+++ b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // LMSensors Fanspeeds
-if ($device['os'] == 'linux') {
+if ($device['os'] == 'linux' || $device['os'] == 'pktj') {
     $oids = snmp_walk($device, 'lmFanSensorsDevice', '-OsqnU', 'LM-SENSORS-MIB');
     d_echo($oids."\n");
 
diff --git a/includes/discovery/sensors/temperatures/lm-sensors.inc.php b/includes/discovery/sensors/temperatures/lm-sensors.inc.php
index 1482b356c..0072b2342 100644
--- a/includes/discovery/sensors/temperatures/lm-sensors.inc.php
+++ b/includes/discovery/sensors/temperatures/lm-sensors.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == 'linux') {
+if ($device['os'] == 'linux' || $device['os'] == 'pktj') {
     $oids = snmp_walk($device, 'lmTempSensorsDevice', '-Osqn', 'LM-SENSORS-MIB');
     d_echo($oids."\n");
 
diff --git a/includes/discovery/sensors/voltages/linux.inc.php b/includes/discovery/sensors/voltages/linux.inc.php
index 061594ede..6a2b1bdfd 100644
--- a/includes/discovery/sensors/voltages/linux.inc.php
+++ b/includes/discovery/sensors/voltages/linux.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 // LMSensors Voltages
-if ($device['os'] == 'linux') {
+if ($device['os'] == 'linux' || $device['os'] == 'pktj') {
     $oids = snmp_walk($device, 'lmVoltSensorsDevice', '-OsqnU', 'LM-SENSORS-MIB');
     d_echo($oids."\n");