diff --git a/kexec-tools.spec b/kexec-tools.spec
index 3698c2e..d80f9bb 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 62%{?dist}
+Release: 63%{?dist}
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -237,6 +237,9 @@ rm -f %{_datadir}/firstboot/modules/firstboot_kdump.py
 %doc kexec-kdump-howto.txt
 
 %changelog
+* Thu Mar 15 2007 Neil Horman <nhorman@redhat.com> - 1.101-63%{dist}
+- Adding extra check to avoid oom kills on nfs mount failure (bz 215056)
+
 * Tue Mar 06 2007 Neil Horman <nhorman@redhat.com> - 1.101-62%{dist}
 - Updating makedumpfile to version 1.1.1 (bz 2223743)
 
diff --git a/mkdumprd b/mkdumprd
index 558597e..694ab30 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -1569,15 +1569,18 @@ if [ -n "$KDUMP_CONFIG_FILE" ]; then
                         #setup nfs case
                         mkdir -p $MNTIMAGE/mnt
                         emit "mount -t nfs -o nolock $rlocation /mnt"
-                        emit "mkdir -p /mnt/$SAVE_PATH/$lhost-\$DATE"
-                        emit "$CORE_COLLECTOR /proc/vmcore /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete"
                         emit "if [ \$? == 0 ]"
                         emit "then"
-                        emit "  mv /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore"
+                        emit "  mkdir -p /mnt/$SAVE_PATH/$lhost-\$DATE"
+                        emit "  $CORE_COLLECTOR /proc/vmcore /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete"
+                        emit "  if [ \$? == 0 ]"
+                        emit "  then"
+                        emit "      mv /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore-incomplete /mnt/$SAVE_PATH/$lhost-\$DATE/vmcore"
+                        emit "      umount /mnt"
+                        emit "      reboot -f"
+                        emit "  fi"
                         emit "  umount /mnt"
-                        emit "  reboot -f"
                         emit "fi"
-                        emit "umount /mnt"
                     else
                         #SSH path
                         #rebuild $location replacing machine name with ip address