diff --git a/kdump.init b/kdump.init
index bec8b1b..b1c4ec9 100644
--- a/kdump.init
+++ b/kdump.init
@@ -75,6 +75,7 @@ function load_kdump()
 	if [ -z "$KDUMP_COMMANDLINE" ]; then
 		KDUMP_COMMANDLINE=`cat /proc/cmdline`
 		KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'`
+		KDUMP_COMMANDLINE="${KDUMP_COMMANDLINE} irqpoll"
 	fi
 
 	$KEXEC $KEXEC_ARGS $standard_kexec_args $KEXEC_HEADERS \
@@ -92,13 +93,14 @@ case "$1" in
 	fi
 	;;
   stop)
-	$KEXEC -u
+	$KEXEC -u -p
 	;;
   status)
 	echo "not implemented"
 	;;
   restart)
-	echo "not implemented"
+	$KEXEC -u -p
+	load_kdump
 	;;
   condrestart)
 	;;
diff --git a/kdump.sysconfig b/kdump.sysconfig
index 44f6f70..fa03ec4 100644
--- a/kdump.sysconfig
+++ b/kdump.sysconfig
@@ -9,7 +9,7 @@ KDUMP_KERNELVER=""
 #   KDUMP_COMMANDLINE="ro root=LABEL=/"
 # If a command line is not specified, the default will be taken from
 # /proc/cmdline
-KDUMP_COMMANDLINE=""
+KDUMP_COMMANDLINE="REPLACEME"
 
 # Any additional kexec arguments required.  In most situations, this should
 # be left empty
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 998fefe..cb9caed 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 1.101
-Release: 7.1.1
+Release: 8
 License: GPL
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -64,6 +64,10 @@ install -m 755 kdump.init $RPM_BUILD_ROOT/etc/rc.d/init.d/kdump
 rm -rf $RPM_BUILD_ROOT
 
 %post
+KDUMP_COMMANDLINE=`cat /proc/cmdline`
+KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'`
+export KDUMP_COMMANDLINE
+sed -i -e "s|REPLACEME|$KDUMP_COMMANDLINE irqpoll|g" /etc/sysconfig/kdump
 chkconfig --add kdump
 
 %postun
@@ -92,6 +96,12 @@ exit 0
 %doc TODO
 
 %changelog
+* Fri Feb 17 2006 Jeff Moyer <jmoyer@redhat.com> - 1.101-8
+- Fix the service stop case.  It was previously unloading the wrong kernel.
+- Implement the "restart" function.
+- Add the "irqpoll" option as a default kdump kernel commandline parameter.
+- Create a default kernel command line in the sysconfig file upon rpm install.
+
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.101-7.1.1
 - rebuilt for new gcc4.1 snapshot and glibc changes