diff --git a/nfs-utils.changes b/nfs-utils.changes
index 1250396..4e28bcd 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Feb 16 23:55:22 UTC 2011 - nfbrown@novell.com
+
+- nfs.init: improve handling of paths with spaces.
+  If a path name has a space, it will appear as \040
+  in fstab and in /proc/mounts.  Using 'grep -E' to search
+  for this is problematic as it will interpret the
+  '\'.  So use 'grep -F' instead - we know there is
+  only a single space in /proc/mounts.  Also use
+  "read -r" so 'read' doesn't interpret the '/'.
+  (bnc#666128)
+
+-------------------------------------------------------------------
+Wed Feb 16 23:49:40 UTC 2011 - nfbrown@novell.com
+
+- nfsserver.init: make sure sm-notify runs on restart.
+  If we stop nfsd, that might also stop lockd which would
+  drop locks.  So make sure lockd really does drop lock
+  for consistency, and ensure that sm-notify is run when
+  nfsserver is restarted. (bnc#668280)
+
 -------------------------------------------------------------------
 Mon Jan 31 07:49:03 UTC 2011 - lnussel@suse.de
 
diff --git a/nfs.init b/nfs.init
index 6e0871b..e52d178 100644
--- a/nfs.init
+++ b/nfs.init
@@ -43,7 +43,7 @@ if [ "x$nfs" != "xyes" ]
 then nfs=no
 fi
 
-while read  what where type options rest  ; do
+while read -r what where type options rest  ; do
     case "$what" in
 	\#*|"")     continue ;;
     esac
@@ -56,7 +56,7 @@ while read  what where type options rest  ; do
     esac
     nfs=yes
     if test "$1" = status ; then
-	grep -qE "^$what[[:blank:]]+$where[[:blank:]]+nfs" /proc/mounts && continue
+	grep -qF "$what $where nfs" /proc/mounts && continue
         state=3
 	continue
     fi
diff --git a/nfsserver.init b/nfsserver.init
index 5c2f9f5..e037df6 100644
--- a/nfsserver.init
+++ b/nfsserver.init
@@ -248,7 +248,12 @@ case "$1" in
       if ! checkproc -n lockd; then
 	  echo -n " statd"
           killproc rpc.statd
+      else
+	  # tell lockd to drop all client locks
+	  killproc -n -KILL lockd
       fi
+      # make sure sm-notify is run on restart, as we have dropped some locks
+      rm -f /var/run/sm-notify.pid
       #
       # rpc.mountd
       echo -n " mountd"