diff --git a/nfs-utils.changes b/nfs-utils.changes
index f7d9484..a41eec0 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May  2 05:22:19 CEST 2008 - nfbrown@suse.de
+
+- Added SM_NOTIFY_OPTIONS sysconfig - (bnc #379806)
+- Removed needless rc_status/rc_exit games in nfsserver.init (bnc #380156)
+- Fixed some sysconfig entries that asked to restart non-existent
+   services (gssd and idmpad have been rolled in to nfs/nfsserver). 
+
 -------------------------------------------------------------------
 Fri Apr 11 12:08:38 CEST 2008 - jsrain@suse.cz
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index e9262bb..7684f66 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -16,7 +16,7 @@ BuildRequires:  e2fsprogs-devel gcc-c++ krb5-devel libevent libgssglue-devel lib
 Url:            http://nfs.sourceforge.net
 Summary:        Support Utilities for Kernel nfsd
 Version:        1.1.2
-Release:        4
+Release:        5
 Group:          Productivity/Networking/NFS
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -250,6 +250,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
 
 %changelog
+* Fri May 02 2008 nfbrown@suse.de
+- Added SM_NOTIFY_OPTIONS sysconfig - (bnc #379806)
+- Removed needless rc_status/rc_exit games in nfsserver.init (bnc #380156)
+- Fixed some sysconfig entries that asked to restart non-existent
+  services (gssd and idmpad have been rolled in to nfs/nfsserver).
 * Fri Apr 11 2008 jsrain@suse.cz
 - fixed more bugs in port information for SuSEfirewall2 (bnc #373969)
 * Wed Apr 09 2008 jsrain@suse.cz
diff --git a/nfs.init b/nfs.init
index 47c941a..396e652 100644
--- a/nfs.init
+++ b/nfs.init
@@ -151,7 +151,7 @@ case "$1" in
 	mount_usr
 	# sm-notify
 	echo -n " sm-notify"
-	/usr/sbin/sm-notify
+	/usr/sbin/sm-notify $SM_NOTIFY_OPTIONS
 	# gssd
 	if [ "$NEED_GSSD" = yes ]; then
  	    echo -n " gssd"
diff --git a/nfsserver.init b/nfsserver.init
index cc7439c..99ca414 100644
--- a/nfsserver.init
+++ b/nfsserver.init
@@ -221,7 +221,7 @@ case "$1" in
       fi
       # sm-notify needs to be run last
       echo -n " sm-notify"
-      /usr/sbin/sm-notify
+      /usr/sbin/sm-notify $SM_NOTIFY_OPTIONS
       #
       rc_status -v
       ;;
@@ -314,31 +314,19 @@ case "$1" in
 	if [ "$NEED_SVCGSSD" = yes ]; then
 	    echo -n " svcgssd"
 	    checkproc $SVCGSSD_BIN
-	    if [ $? != 0 ]; then
-	        rc_status -v
-	        rc_exit
-	    fi
+	    rc_status -v
 	fi
 	if [ "$NEED_IDMAPD" = yes ]; then
 	    echo -n " idmapd"
 	    checkproc $IDMAPD_BIN
-	    if [ $? != 0 ]; then
-	        rc_status -v
-	        rc_exit
-	    fi
+	    rc_status -v
 	fi 
 	echo -n " mountd"
         checkproc /usr/sbin/rpc.mountd
-	if [ $? != 0 ]; then
-            rc_status -v
-            rc_exit
-        fi
+        rc_status -v
 	echo -n " statd"
 	checkproc /usr/sbin/rpc.statd
-	if [ $? != 0 ]; then
-            rc_status -v
-            rc_exit
-        fi
+        rc_status -v
 	echo -n " nfsd"
         checkproc -n nfsd
         rc_status -v
diff --git a/sysconfig.nfs-nfs-utils b/sysconfig.nfs-nfs-utils
index 1d53d9c..24dd7ae 100644
--- a/sysconfig.nfs-nfs-utils
+++ b/sysconfig.nfs-nfs-utils
@@ -24,7 +24,7 @@ MOUNTD_PORT=""
 ## Description:         GSS security for NFS
 ## Type:                yesno
 ## Default:             yes
-## ServiceRestart:      gssd
+## ServiceRestart:      nfs nfsserver
 #
 # Enable RPCSEC_GSS security for NFS (yes/no)
 #
@@ -34,9 +34,18 @@ NFS_SECURITY_GSS="no"
 ## Description:         NFSv4 protocol support
 ## Type:                yesno
 ## Default:             yes
-## ServiceRestart:      idmapd
+## ServiceRestart:      nfs nfsserver
 #
 # Enable NFSv4 support (yes/no)
 #
 NFS4_SUPPORT="yes"
 
+## Path:                Network/File systems/NFS server
+## Description:         Network Status Monitor options
+## Type:                string
+## Default:             ""
+#
+#
+SM_NOTIFY_OPTIONS=""
+
+