Index: mainserver.cpp
===================================================================
--- mainserver.cpp	(revision 8603)
+++ mainserver.cpp	(working copy)
@@ -23,6 +23,7 @@
 
 #include <list>
 #include <iostream>
+#include <fstream>
 using namespace std;
 
 #include <sys/stat.h>
@@ -3842,11 +3843,13 @@
     QDomElement mInfo   = pDoc->createElement("MachineInfo");
     QDomElement storage = pDoc->createElement("Storage"    );
     QDomElement load    = pDoc->createElement("Load"       );
+    QDomElement thermal = pDoc->createElement("Thermal"    );
     QDomElement guide   = pDoc->createElement("Guide"      );
 
     root.appendChild (mInfo  );
     mInfo.appendChild(storage);
     mInfo.appendChild(load   );
+    mInfo.appendChild(thermal);
     mInfo.appendChild(guide  );
 
     // drive space   ---------------------
@@ -3870,6 +3873,22 @@
         load.setAttribute("avg3", rgdAverages[2]);
     }
 
+    // ACPI temperature -----------------
+    ifstream inp("/proc/acpi/thermal_zone/THRM/temperature");
+    std::string msg, temperature;
+
+    if(inp) {
+        inp >> msg >> temperature;
+        if(inp)
+            temperature += " degrees Celsius";
+        else
+            temperature = "unknown";
+    }
+    else
+        temperature = "unknown";
+
+    thermal.setAttribute("temperature", temperature);
+	
     // Guide Data ---------------------
 
     QDateTime GuideDataThrough;
Index: httpstatus.cpp
===================================================================
--- httpstatus.cpp	(revision 8603)
+++ httpstatus.cpp	(working copy)
@@ -697,6 +697,24 @@
         }
     }
 
+   // ACPI temperature ------------------
+
+    node = info.namedItem( "Thermal" );
+
+    if (!node.isNull())
+    {
+        QDomElement e = node.toElement();
+
+        if (!e.isNull())
+        {
+            std::string temperature = e.attribute( "temperature" , "0" );
+
+            os << "      Current CPU temperature: "
+               << temperature
+               << ".<br />\r\n";
+        }
+    }
+	
     // Guide Info ---------------------
 
     node = info.namedItem( "Guide" );