diff --git a/html/pages/health.inc.php b/html/pages/health.inc.php
index a7f729e05..52b3984d0 100644
--- a/html/pages/health.inc.php
+++ b/html/pages/health.inc.php
@@ -84,7 +84,7 @@ switch ($_GET['opta'])
     include('pages/health/'.$_GET['opta'].'.inc.php');
     break;
   default:
-    include('pages/health/temperature.inc.php');
+    include('pages/health/temperature.inc.php'); # FIXME perhaps an error message instead?
     break;
 }
 
diff --git a/includes/polling/sensors.inc.php b/includes/polling/sensors.inc.php
new file mode 100644
index 000000000..a55ff470c
--- /dev/null
+++ b/includes/polling/sensors.inc.php
@@ -0,0 +1,11 @@
+<?php
+
+poll_sensor($device,'current','A');
+poll_sensor($device,'frequency', 'Hz');
+poll_sensor($device,'fanspeed', 'rpm');
+poll_sensor($device,'humidity', '%');
+
+# FIXME also convert temperature, but there's some special code in there?
+include('includes/polling/temperatures.inc.php');
+
+?>
\ No newline at end of file