diff --git a/includes/definitions/discovery/apc.yaml b/includes/definitions/discovery/apc.yaml
index 8ff676f5a9..98ddf32a50 100644
--- a/includes/definitions/discovery/apc.yaml
+++ b/includes/definitions/discovery/apc.yaml
@@ -125,6 +125,46 @@ modules:
                     states:
                         - { descr: normal, graph: 1, value: 1, generic: 0 }
                         - { descr: alarm, graph: 1, value: 2, generic: 2 }
+                -
+                    oid: rPDU2SensorTempHumidityStatusTable
+                    state_name: rPDU2SensorTempHumidityStatusTempStatus
+                    value: rPDU2SensorTempHumidityStatusTempStatus
+                    num_oid: .1.3.6.1.4.1.318.1.1.26.10.2.2.1.9.
+                    index: 'rPDU2SensorTempHumidityStatusTempStatus.{{ $index }}'
+                    descr: 'Temperature Probe Status'
+                    states:
+                        - { descr: notPresent, graph: 1, value: 1, generic: 3 }
+                        - { descr: belowMin, graph: 1, value: 2, generic: 2 }
+                        - { descr: belowLow, graph: 1, value: 3, generic: 1 }
+                        - { descr: normal, graph: 1, value: 4, generic: 0 }
+                        - { descr: aboveHigh, graph: 1, value: 5, generic: 1 }
+                        - { descr: aboveMax, graph: 1, value: 6, generic: 2 }
+                    skip_values:
+                      -
+                        oid: rPDU2SensorTempHumidityStatusTempStatus
+                        op: '='
+                        value: 1
+
+                -
+                    oid: rPDU2SensorTempHumidityStatusTable
+                    state_name: rPDU2SensorTempHumidityStatusHumidityStatus
+                    value: rPDU2SensorTempHumidityStatusHumidityStatus
+                    num_oid: .1.3.6.1.4.1.318.1.1.26.10.2.2.1.11.
+                    index: 'rPDU2SensorTempHumidityStatusHumidityStatus.{{ $index }}'
+                    descr: 'Humidity Probe Status'
+                    states:
+                        - { descr: notPresent, graph: 1, value: 1, generic: 3 }
+                        - { descr: belowMin, graph: 1, value: 2, generic: 2 }
+                        - { descr: belowLow, graph: 1, value: 3, generic: 1 }
+                        - { descr: normal, graph: 1, value: 4, generic: 0 }
+                        - { descr: aboveHigh, graph: 1, value: 5, generic: 1 }
+                        - { descr: aboveMax, graph: 1, value: 6, generic: 2 }
+                    skip_values:
+                      -
+                        oid: rPDU2SensorTempHumidityStatusHumidityStatus
+                        op: '='
+                        value: 1
+
         temperature:
             data:
                 -
@@ -232,6 +272,18 @@ modules:
                     index: 'airIRG2RDT2StatusSuctionTempMetric.{{ $index }}'
                     descr: 'Suction'
                     divisor: 10
+                -
+                    oid: rPDU2SensorTempHumidityStatusTable
+                    value: rPDU2SensorTempHumidityStatusTempC
+                    num_oid: .1.3.6.1.4.1.318.1.1.26.10.2.2.1.8.
+                    index: 'rPDU2SensorTempHumidityStatusTempC.{{ $index }}'
+                    descr: 'Temperature Probe'
+                    divisor: 10
+                    skip_values:
+                      -
+                        oid: rPDU2SensorTempHumidityStatusType
+                        op: '='
+                        value: 4
         humidity:
             data:
                 -
@@ -258,6 +310,17 @@ modules:
                     index: 'airIRRP500UnitStatusSupplyHumidity.{{ $index }}'
                     descr: Return
                     divisor: 10
+                -
+                    oid: rPDU2SensorTempHumidityStatusTable
+                    value: rPDU2SensorTempHumidityStatusRelativeHumidity
+                    num_oid: .1.3.6.1.4.1.318.1.1.26.10.2.2.1.10.
+                    index: 'rPDU2SensorTempHumidityStatusRelativeHumidity.{{ $index }}'
+                    descr: 'Humidity Probe'
+                    skip_values:
+                      -
+                        oid: rPDU2SensorTempHumidityStatusType
+                        op: '='
+                        value: 4
         airflow:
             data:
                 -
diff --git a/includes/discovery/sensors/state/apc.inc.php b/includes/discovery/sensors/state/apc.inc.php
index 4e99714eec..fe1793e48a 100644
--- a/includes/discovery/sensors/state/apc.inc.php
+++ b/includes/discovery/sensors/state/apc.inc.php
@@ -2,7 +2,7 @@
 /*
  * LibreNMS
  *
- * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * Copyright (c) 2016 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