diff --git a/kexec-tools.changes b/kexec-tools.changes
index 0c0d02e..c7bbd71 100644
--- a/kexec-tools.changes
+++ b/kexec-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 22 16:55:27 CEST 2007 - bwalle@suse.de
+
+- disable -fstack-protector on IA64 since the kdump kernel doesn't
+  boot with -fstack-protector enabled
+
 -------------------------------------------------------------------
 Thu Jun 21 16:27:33 CEST 2007 - bwalle@suse.de
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index c76936c..60d6113 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -18,7 +18,7 @@ Requires:       %insserv_prereq %fillup_prereq
 Autoreqprov:    on
 Summary:        Tools for fast kernel loading
 Version:        1.101
-Release:        111
+Release:        112
 Source:         %{name}-%{package_version}.tar.bz2
 Source1:        kdump
 Source2:        sysconfig.kdump
@@ -66,6 +66,9 @@ cp %{SOURCE5} .
 %build
 autoreconf -fi
 ./configure --prefix=/ --sbindir=/sbin --libdir=/%_lib
+%ifarch ia64
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//')
+%endif
 make CPPFLAGS="$RPM_OPT_FLAGS"
 
 %install
@@ -129,6 +132,9 @@ true   # ignore errors
 /var/adm/fillup-templates/sysconfig.kdump
 
 %changelog
+* Fri Jun 22 2007 - bwalle@suse.de
+- disable -fstack-protector on IA64 since the kdump kernel doesn't
+  boot with -fstack-protector enabled
 * Thu Jun 21 2007 - bwalle@suse.de
 - kdump init script: fix handling of spaces in kernel type
 * Wed Jun 13 2007 - bwalle@suse.de