diff --git a/debian/changelog b/debian/changelog
index e50b27b0..1990e74b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 byobu (4.25) unreleased; urgency=low
 
-  * UNRELEASED
+  * usr/lib/byobu/fan_speed, usr/share/byobu/status/statusrc,
+    usr/share/man/man1/byobu.1:
+    - fix fan speed detection for a few models
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 01 Aug 2011 23:46:43 -0500
 
diff --git a/usr/lib/byobu/fan_speed b/usr/lib/byobu/fan_speed
index 2ba234b1..8f2af76c 100755
--- a/usr/lib/byobu/fan_speed
+++ b/usr/lib/byobu/fan_speed
@@ -28,7 +28,7 @@ __fan_speed() {
 	local i="" speed=0
 	# Let's check a few different probes for fan speed
 	# This seems to cover most of them:
-	for i in /sys/class/hwmon/*/*/fan1_input; do
+	for i in $FAN /sys/class/hwmon/*/*/fan1_input /sys/class/hwmon/*/device/hwmon/*/fan1_input; do
 		[ -f "$i" ] || continue
 		read speed < "$i"
 		if [ "$speed" -gt 0 ]; then
diff --git a/usr/share/byobu/status/statusrc b/usr/share/byobu/status/statusrc
index 58385855..e881a3d9 100644
--- a/usr/share/byobu/status/statusrc
+++ b/usr/share/byobu/status/statusrc
@@ -31,3 +31,4 @@
 #TEMP=F
 #DISTRO=Ubuntu
 #SERVICES="eucalyptus-nc|NC eucalyptus-cloud|CLC eucalyptus-walrus eucalyptus-cc|CC eucalyptus-sc|SC"
+#FAN=$(find /sys -type f -name fan1_input | head -n1)
diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1
index f2dbad96..bda4841b 100644
--- a/usr/share/man/man1/byobu.1
+++ b/usr/share/man/man1/byobu.1
@@ -45,7 +45,7 @@ Note that BYOBU_CONFIG_DIR=\fI$HOME/.byobu\fP.
 
 \fBrcs_cost\fP \- an estimation of the cost of the current boot of the system in terms of the Rackspace Cloud Server billing model; displayed in the lower bar toward the right in green text on a black background; there is a leading '~' to indicate that this is an estimation, and the monetary units are US Dollars '$'
 
-\fBfan_speed\fP \- cpu or system fan speed as reported by lm-sensors; displayed in the lower bar toward the right in black text on a grey background; there is a trailing 'rpm' for units
+\fBfan_speed\fP \- cpu or system fan speed as reported by lm-sensors; displayed in the lower bar toward the right in black text on a grey background; there is a trailing 'rpm' for units; you may override the detected fan by setting FAN=/sys/path/to/your/fan1_input in \fI$BYOBU_CONFIG_DIR/statusrc\fP
 
 \fBhostname\fP \- the hostname of the system; displayed in the upper bar on the far right in bold black text on a grey background; there is a leading '@' symbol if the username status is also enabled