diff --git a/plugins/check_temperature b/plugins/check_temperature
index 6d87bba..7fd9477 100755
--- a/plugins/check_temperature
+++ b/plugins/check_temperature
@@ -266,7 +266,8 @@ if __name__ == '__main__':
         nagiosresult = NAGIOS_OK
 
     nagios_exit(nagiosresult, message, {
-          'temperature': [ temperature, args.warn, args.critical, None, None],
+          'temperature': [ '%f%s' % (temperature, temp_unit),
+                            args.warn, args.critical, None, None],
           'retries': [ tries-1, None, args.retries, 0, None ],
-          'time': [ '%f' % elapse, None, None, 0, None]
+          'checktime': [ '%fs' % elapse, None, None, 0, None]
     })