diff --git a/kdump.init b/kdump.init
index 62d9b30..d51f6d3 100644
--- a/kdump.init
+++ b/kdump.init
@@ -57,6 +57,9 @@ function check_config()
 	then
 		$LOGGER "Using Kdump advanced configuration service"
 		MKDUMPRD=/sbin/mkdumprd2
+		# We always rebuild here, since it takes longer
+		# to figure out if anything has changed
+		touch /etc/kdump.conf
 	else
 		MKDUMPRD=/sbin/mkdumprd
 	fi
diff --git a/kdump_build_helpers/populate_kdump_std_files b/kdump_build_helpers/populate_kdump_std_files
index c10902c..e05e967 100755
--- a/kdump_build_helpers/populate_kdump_std_files
+++ b/kdump_build_helpers/populate_kdump_std_files
@@ -34,6 +34,7 @@ do
 done
 
 # make dash our default shell
+rm -f $STAGE_DIR/bin/sh
 $(cd $STAGE_DIR/bin; ln -s /bin/dash sh)
 
 exit 0
diff --git a/kexec-tools.spec b/kexec-tools.spec
index d8c4e18..f5fd77a 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -263,6 +263,7 @@ done
 - Updated initscript to use mkdumprd2 if manifest is present
 - Updated spec to require dash
 - Updated sample manifest to point to correct initscript
+- Updated populate_std_files helper to fix sh symlink
 
 * Mon Jul 06 2009 Neil Horman <nhorman@redhat.com> 2.0.0-17
 - Fixed mkdumprd2 tarball creation
diff --git a/mkdumprd2 b/mkdumprd2
index 4e26d70..1c79fbd 100755
--- a/mkdumprd2
+++ b/mkdumprd2
@@ -311,9 +311,9 @@ create_initramfs_image()
 		cleanup_and_exit 1 " Could not create initramfs"
 	fi
 
-	# Get running kernel version to name the initramfs with
-	target=$(uname -r)
-	gzip -9 -c $IMG_FILE > ./initrd-$target.img
+	# argument 1 is passed in and is the full path to the
+	# output initramfs name 
+	gzip -9 -c $IMG_FILE > $1 
 }
 
 
@@ -322,6 +322,17 @@ create_initramfs_image()
 ##########################################################
 
 # Get our passed in options
+INITRAMFS_NAME=$1
+
+#validate the options
+if [ -z "INITRAMFS_NAME" ]
+then
+	cleanup_and_exit 1 "Need an initramfs name"
+fi
+
+
+export INITRAMFS_NAME
+export KERNEL_NAME
 
 #setup working env
 setup_env
@@ -341,7 +352,7 @@ prep_std_initramfs
 populate_from_manifest
 
 # Do image file creation
-create_initramfs_image
+create_initramfs_image $INITRAMFS_NAME
 
 # Cleanup
 cleanup_and_exit 0 ""