Index: xdg-utils/scripts/xdg-mime
===================================================================
--- xdg-utils.orig/scripts/xdg-mime
+++ xdg-utils/scripts/xdg-mime
@@ -1076,7 +1076,7 @@
 
         # No quotes around $mimetypes
         for x in $mimetypes ; do 
-            if grep '^# Installed by xdg-mime' $kde_dir/$x.desktop &>/dev/null ; then
+            if grep '^# Installed by xdg-mime' $kde_dir/$x.desktop >/dev/null 2>&1; then
                 DEBUG 1 "Removing $kde_dir/$x.desktop (KDE 3.x support)"
                 rm -f $kde_dir/$x.desktop
             fi
Index: xdg-utils/scripts/xdg-screensaver
===================================================================
--- xdg-utils.orig/scripts/xdg-screensaver
+++ xdg-utils/scripts/xdg-screensaver
@@ -364,7 +364,7 @@
    # No secure moves available, use home dir
    DEBUG 1 "mv -T not available"
    MV="mv"
-   screensaver_file="$HOME/.xdg-screensaver-"`echo $HOSTNAME-$DISPLAY | sed 's/:/-/g'`
+   screensaver_file="$HOME/.xdg-screensaver-"`echo $(hostname)-$DISPLAY | sed 's/:/-/g'`
 fi
 lockfile_command=`which lockfile 2> /dev/null`
 
@@ -464,7 +464,7 @@
   unlockfile # Free lockfile
   if [ -n "$xprop_pid" ] && ps -p "$xprop_pid" 2> /dev/null | grep xprop > /dev/null; then
      # Kill the tracking process 
-     kill -TERM $xprop_pid
+     kill -s TERM $xprop_pid
   fi
   cleanup_suspend  
 }