diff --git a/libguestfs.spec b/libguestfs.spec
index c940fbc..8d000d1 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -335,19 +335,25 @@ chmod 755 mkinitrd/scripts/*guestfs.sh
 	-i $PWD/mkinitrd
 mkdir mkinitrd/boot_tmp
 kver=`/sbin/get_kernel_version /boot/vmlinuz`
-cp -avL /boot/vmlinuz /boot/System.map-${kver} mkinitrd/boot_tmp
+arch=`arch`
+%ifarch %ix86
+arch=i686 #?
+%endif
+cp -avL /boot/vmlinuz mkinitrd/boot_tmp/vmlinuz.${arch}
+cp -avL /boot/System.map-${kver} mkinitrd/boot_tmp
 env PATH=${RPM_BUILD_ROOT}/usr/bin:${RPM_BUILD_ROOT}/usr/sbin:${PATH} \
 /sbin/mkinitrd \
 	-l $PWD/mkinitrd \
-	-k vmlinuz \
-	-i initrd \
+	-k vmlinuz.${arch} \
+	-i initramfs.${arch}.img \
 	-b $PWD/mkinitrd/boot_tmp \
 	-m 'dm-mod loop' \
 	-B
 #
 mkdir -vp $RPM_BUILD_ROOT%{_libdir}/guestfs
-cp -avL mkinitrd/boot_tmp/initrd  $RPM_BUILD_ROOT%{_libdir}/guestfs/initramfs.`arch`.img
-cp -avL mkinitrd/boot_tmp/vmlinuz $RPM_BUILD_ROOT%{_libdir}/guestfs/vmlinuz.`arch`
+cp -avLt $RPM_BUILD_ROOT%{_libdir}/guestfs/ \
+	mkinitrd/boot_tmp/initramfs.${arch}.img \
+	mkinitrd/boot_tmp/vmlinuz.${arch}
 
 %clean
 rm -rf $RPM_BUILD_ROOT