diff --git a/pam_mount-0.18-umount-home-dir.dif b/pam_mount-0.18-umount-home-dir.dif
index c697238..3e381ba 100644
--- a/pam_mount-0.18-umount-home-dir.dif
+++ b/pam_mount-0.18-umount-home-dir.dif
@@ -1,11 +1,11 @@
---- scripts/umount.crypt
-+++ scripts/umount.crypt	2007/01/12 08:59:14
+--- scripts/umount.crypt	2006-07-11 17:01:46.000000000 -0400
++++ scripts/umount.crypt	2007-01-23 10:35:30.000000000 -0500
 @@ -57,6 +57,15 @@
      exit 1;
  fi;
  
 +# kill remaining user processes if we're unmounting a user's home dir
-+getent passwd | grep -e ":$1:" &> /dev/null
++USER=`stat --format=%U $1 2>/dev/null` && getent passwd "$USER" | grep -e ":$1:" &> /dev/null
 +if test $? -eq 0; then
 +    lsof -t $1 | xargs kill -TERM &> /dev/null
 +    sleep 1
@@ -16,3 +16,12 @@
  # ask cryptsetup about the underlying device
  #
  REALDEVICE=` "$CRYPTSETUP" status "$DMDEVICE" | sed -n '/device/s/[ ]*device:[ ]*//p'`;
+@@ -69,7 +78,7 @@
+ 
+ # Check for LUKS
+ #
+-if "$CRYPTSETUP" isLuks "$DEVICE" 2>/dev/null; then
++if "$CRYPTSETUP" isLuks "$REALDEVICE" 2>/dev/null; then
+     "$CRYPTSETUP" luksClose "$DMDEVICE";
+ else
+     "$CRYPTSETUP" remove "$DMDEVICE";
diff --git a/pam_mount.changes b/pam_mount.changes
index a59ce33..ac09240 100644
--- a/pam_mount.changes
+++ b/pam_mount.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 23 17:13:45 CET 2007 - mc@suse.de
+
+- fix umount encrypted homedirectories
+  [#237793] 
+
 -------------------------------------------------------------------
 Thu Jan 18 09:25:19 CET 2007 - mc@suse.de
 
diff --git a/pam_mount.spec b/pam_mount.spec
index 0c24218..5a7dc4a 100644
--- a/pam_mount.spec
+++ b/pam_mount.spec
@@ -14,7 +14,7 @@ Name:           pam_mount
 BuildRequires:  glib2-devel openssl-devel pam-devel
 Summary:        A PAM Module that can Mount Volumes for a User Session.
 Version:        0.18
-Release:        31
+Release:        32
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
 Prefix:         /usr
 Group:          System/Libraries
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man8/umount.crypt.8.gz
 
 %changelog -n pam_mount
+* Tue Jan 23 2007 - mc@suse.de
+- fix umount encrypted homedirectories
+  [#237793]
 * Thu Jan 18 2007 - mc@suse.de
 - disable debug
 - increase MAX_PAR to be able to read longer keys