diff --git a/lm_sensors.init b/lm_sensors.init
index dca7a77..413944c 100644
--- a/lm_sensors.init
+++ b/lm_sensors.init
@@ -96,7 +96,17 @@ stop() {
 }
 
 dostatus() {
-	$PSENSORS
+	if test -s "$FANCONFIG" -a -x "$PFAN" ; then
+		echo -n "Checking for fan control daemon: "
+		/sbin/checkproc "$PFAN"
+		rc_status -v
+	fi
+
+	if test -e "$LOCK" ; then
+		$PSENSORS
+	else
+		rc_failed 3
+	fi
 	rc_status
 }
 
diff --git a/sensors.changes b/sensors.changes
index daa7efe..ac9a8f9 100644
--- a/sensors.changes
+++ b/sensors.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 13 13:08:07 CEST 2010 - jdelvare@suse.de
+
+- Properly implement "rclm_sensors status" (bnc#592273).
+
 -------------------------------------------------------------------
 Wed Mar 31 15:18:29 CEST 2010 - jdelvare@suse.de
 
diff --git a/sensors.spec b/sensors.spec
index 5ceecaa..95a1a66 100644
--- a/sensors.spec
+++ b/sensors.spec
@@ -22,7 +22,7 @@ Name:           sensors
 BuildRequires:  bison flex rrdtool-devel
 Url:            http://www.lm-sensors.org/
 Version:        3.1.2
-Release:        2
+Release:        3
 Summary:        Hardware health monitoring for Linux
 License:        GPLv2+
 Group:          System/Monitoring