-# the extra star should address the -i686 part, that k27 does not have
-%define kernel_id %{kernel_version}-%{kernel_release}*
+# the k27 and before does not have the -i686 part
+%define kernel_id_old %{kernel_version}-%{kernel_release}
+%define kernel_id_new %{kernel_version}-%{kernel_release}-%{_target_cpu}
+%define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )