diff --git a/kdump.changes b/kdump.changes
index 1777a68..4800340 100644
--- a/kdump.changes
+++ b/kdump.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Jun 01 17:56:40 CEST 2008 - bwalle@suse.de
+
+- set KDUMP_KERNELVER="" on i386 instead of KDUMP_KERNELVER="kdump"
+  (with "kdump", the kdump kernel cannot be loaded without manually
+  editing the configuration file (bnc#396221)
+
 -------------------------------------------------------------------
 Mon May 26 17:45:18 CEST 2008 - bwalle@suse.de
 
diff --git a/kdump.spec b/kdump.spec
index a431561..b127eeb 100644
--- a/kdump.spec
+++ b/kdump.spec
@@ -15,7 +15,7 @@ Name:           kdump
 License:        GPL v2 or later
 BuildRequires:  libelf0-devel zlib-devel
 Version:        0.3.3
-Release:        29
+Release:        31
 Requires:       curl openssh
 Recommends:     makedumpfile
 Summary:        Script for kdump
@@ -76,7 +76,7 @@ ln -s /etc/init.d/kdump $RPM_BUILD_ROOT/sbin/rckdump
 sed -i 's@^\(KEXEC_OPTIONS="\)\(.*"[[:blank:]]*$\)@\1--args-linux \2@'\
         $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.kdump
 %endif
-%ifarch x86_64 i386 ia64
+%ifarch %ix86 x86_64 ia64
 # empty KDUMP_KERNELVER since we have no special kdump kernel on that archs
 sed -i -e 's@^\(KDUMP_KERNELVER=\).*$@\1""@' \
    -e 's@^\(KDUMP_COMMANDLINE_APPEND="\)\(.*"[[:blank:]]*$\)@\1maxcpus=1 \2@' \
@@ -149,6 +149,10 @@ fi
 %{_sysconfdir}/udev/rules.d/70-kdump.rules
 
 %changelog
+* Sun Jun 01 2008 bwalle@suse.de
+- set KDUMP_KERNELVER="" on i386 instead of KDUMP_KERNELVER="kdump"
+  (with "kdump", the kdump kernel cannot be loaded without manually
+  editing the configuration file (bnc#396221)
 * Mon May 26 2008 bwalle@suse.de
 - fix load of kdump kernel when KDUMP_KERNELVER="kdump" on ppc64
   (bnc#394216)