diff --git a/kexec-tools.changes b/kexec-tools.changes
index 3589a9a..7371736 100644
--- a/kexec-tools.changes
+++ b/kexec-tools.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jun 13 16:51:53 CEST 2007 - bwalle@suse.de
+
+- remove KDUMP_KERNELVER="kdump" on x86_64 and i386 since there's
+  no special "kdump" kernel any more in the default configuration
+  (i.e. in the .spec file since it's different for the
+  architectures)
+
+-------------------------------------------------------------------
+Wed Jun 13 15:21:27 CEST 2007 - bwalle@suse.de
+
+- removed libelf as BuildRequires
+
 -------------------------------------------------------------------
 Mon Jun 11 17:06:07 CEST 2007 - bwalle@suse.de
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index ae7fccc..d436aee 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:        108
+Release:        110
 Source:         %{name}-%{package_version}.tar.bz2
 Source1:        kdump
 Source2:        sysconfig.kdump
@@ -27,7 +27,7 @@ Source4:        gdb-kdump
 Source5:        README.SUSE
 URL:            http://www.vergenet.net/linux/kexec/kexec-tools/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libelf zlib-devel
+BuildRequires:  zlib-devel
 Requires:       kdump-helpers
 Patch:          kexec-tools-testing-20070319-rc.patch
 Patch1:         kexec-longer-cmdline.diff
@@ -82,13 +82,17 @@ install -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig
 # add --args-linux kexec command line option as default
 sed -i 's@^\(KEXEC_OPTIONS="\)\(.*"[[:blank:]]*$\)@\1--args-linux \2@' $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.kdump
 %endif
-%ifarch ia64
-# empty string for kdump kernel version (to indicate the same kernel)
+%ifarch x86_64 i386 ia64
+# empty KDUMP_KERNELVER since we have no special kdump kernel on that archs
 sed -i -e 's@^\(KDUMP_KERNELVER=\).*$@\1""@' \
-   -e 's@^\(KEXEC_OPTIONS="\)\(.*"[[:blank:]]*$\)@\1--noio \2@' \
    -e 's@^\(KDUMP_COMMANDLINE_APPEND="\)\(.*"[[:blank:]]*$\)@\1maxcpus=1 \2@' \
    $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.kdump
 %endif
+%ifarch ia64
+# add --noio since kexec is broken without --noio on most machines
+sed -i -e 's@^\(KEXEC_OPTIONS="\)\(.*"[[:blank:]]*$\)@\1--noio \2@' \
+   $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.kdump
+%endif
 # install gdb helpers
 mkdir -p $RPM_BUILD_ROOT%{_datadir}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -125,6 +129,13 @@ true   # ignore errors
 /var/adm/fillup-templates/sysconfig.kdump
 
 %changelog
+* Wed Jun 13 2007 - bwalle@suse.de
+- remove KDUMP_KERNELVER="kdump" on x86_64 and i386 since there's
+  no special "kdump" kernel any more in the default configuration
+  (i.e. in the .spec file since it's different for the
+  architectures)
+* Wed Jun 13 2007 - bwalle@suse.de
+- removed libelf as BuildRequires
 * Mon Jun 11 2007 - bwalle@suse.de
 - moved copying of dump file to an external package
   "kdump-helpers"