diff --git a/nmb.init b/nmb.init
index cdbdf0b..6234ff9 100644
--- a/nmb.init
+++ b/nmb.init
@@ -71,7 +71,7 @@ reload() {
 }	
 
 rhstatus() {
-	status nmbd
+	status -l nmb nmbd
 	return $?
 }	
 
diff --git a/samba.spec b/samba.spec
index 77219d1..fad4024 100644
--- a/samba.spec
+++ b/samba.spec
@@ -656,6 +656,8 @@ exit 0
 %changelog
 * Wed May 12 2010 Guenther Deschner <gdeschner@redhat.com> - 3.4.8-59
 - Update to 3.4.8
+- Make sure nmb and smb initscripts return LSB compliant return codes
+- resolves: #521095
 
 * Mon Mar 08 2010 Simo Sorce <ssorce@redhat.com> - 3.4.7-58
 - Security update to 3.4.7
diff --git a/smb.init b/smb.init
index fbb6152..f9fec26 100644
--- a/smb.init
+++ b/smb.init
@@ -71,7 +71,7 @@ reload() {
 }	
 
 rhstatus() {
-	status smbd
+	status -l smb smbd
 	return $?
 }