diff --git a/bin/temp-c b/bin/temp-c
index 8a780864..c37bd2c9 100755
--- a/bin/temp-c
+++ b/bin/temp-c
@@ -27,7 +27,8 @@ if [ "$1" = "--detail" ]; then
 	exit 0
 fi
 
-if [ -r "$DIR/THM0/temperature" ]; then
-	t=$(sed "s/^[^0-9]\+//" "$DIR"/THM0/temperature | sed "s/\s.*$//")
+for i in `ls "$DIR/THM"*"/temperature"`; do
+	t=$(sed "s/^[^0-9]\+//" "$i" | sed "s/\s.*$//")
 	printf "\005{= kY}%sC\005{-} " "$t"
-fi
+	break
+done
diff --git a/bin/temp-f b/bin/temp-f
index 5f2268a9..482ee3dd 100755
--- a/bin/temp-f
+++ b/bin/temp-f
@@ -23,7 +23,8 @@ if [ "$1" = "--detail" ]; then
 	exit 0
 fi
 
-if [ -r "$DIR/THM0/temperature" ]; then
-	t=$(sed "s/^[^0-9]\+//" "$DIR"/THM0/temperature | sed "s/\s.*$//" | awk '{printf "%.0f", $1 *9/5 + 32}')
+for i in `ls "$DIR/THM"*"/temperature"`; do
+	t=$(sed "s/^[^0-9]\+//" "$i" | sed "s/\s.*$//" | awk '{printf "%.0f", $1 *9/5 + 32}')
 	printf "\005{= kY}%sF\005{-} " "$t"
-fi
+        break
+done
diff --git a/debian/changelog b/debian/changelog
index a84240c6..db04ff9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ byobu (2.6) unreleased; urgency=low
     to be controversial; users will need to call "byobu" to launch
     a byobu-style screen session
   * bin/network-*: set rate=0 when rate is negative (ie, on startup)
+  * bin/temp-*: better support for temperature zones, LP: #380885
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 26 May 2009 21:52:53 +0200
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 28 May 2009 10:40:24 +0200
 
 byobu (2.5-0ubuntu1) karmic; urgency=low