diff --git a/kernel.spec b/kernel.spec
index 68f7e00..4185c71 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		2
+%define rpmrel		3
 %endif
 
 # fakerel and fakever never change, they are used to fool
@@ -54,16 +54,23 @@
 %define patch_ver 	%{kversion}-%{ktag}%{mibrel}
 %endif
 
+%ifarch %{ix86}
+# Use a standard suffix for 32-bit x86
+%define arch_suffix	i586
+%else
+%define arch_suffix	%{_arch}
+%endif
+
 # Used for not making too long names for rpms or search paths
 # replaced mibrel with rpmrel / release > we can use only ONE sources folder for nrj & nrjQL
 %if %kpatch
 %if %kgit
-%define buildrpmrel     0.%{kpatch}.%{kgit}.%{rpmrel}%{rpmtag}
+%define buildrpmrel     0.%{kpatch}.%{kgit}.%{rpmrel}%{rpmtag}-%{arch_suffix}
 %else
-%define buildrpmrel     0.%{kpatch}.%{rpmrel}%{rpmtag}
+%define buildrpmrel     0.%{kpatch}.%{rpmrel}%{rpmtag}-%{arch_suffix}
 %endif
 %else
-%define buildrpmrel     %{rpmrel}%{rpmtag}
+%define buildrpmrel     %{rpmrel}%{rpmtag}-%{arch_suffix}
 %endif
 %define buildrel     	%{kversion}-%{buildrpmrel}
 
@@ -1144,7 +1151,7 @@ find . -name '*~' -o -name '*.orig' -o -name '*.append' | %kxargs rm -f
 %define _kerneldir /usr/src/linux-%{kversion}-%{buildrpmrel}
 %define _bootdir /boot
 %define _modulesdir /lib/modules
-%define _efidir %{_bootdir}/efi/mandriva
+#define _efidir _{_bootdir}/efi/mandriva
 
 # Directories definition needed for building
 %define temp_root %{build_dir}/temp-root