diff --git a/kernel.spec b/kernel.spec
index 00f4cf1..6de57a7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1416,9 +1416,9 @@ EOF
 
 ### Create -devel Preun script on the fly
 cat > $kernel_devel_files-preun <<EOF
-for ii in \$(/usr/sbin/dkms status -k $KernelVer); do
-	mod=\$(echo \$ii | awk -v FS=' ,' '{ print \$1; }')
-	ver=\$(echo \$ii | awk -v FS=' ,' '{ print \$2; }')
+for ii in \$(/usr/sbin/dkms status -k $KernelVer | awk '{ print \$1 \$2; }'); do
+	mod=\$(echo \$ii | awk -v FS=',' '{ print \$1; }')
+	ver=\$(echo \$ii | awk -v FS=',' '{ print \$2; }')
 	/usr/sbin/dkms --rpm_safe_upgrade remove -m \$mod -v \$ver -k $KernelVer || true
 done
 EOF
@@ -1427,7 +1427,7 @@ EOF
 cat > $kernel_devel_files-postun <<EOF
 rm -rf /usr/src/linux-$KernelVer >/dev/null
 # Remove the dir if it is already empty.
-find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \;
+find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \; || true
 EOF
 }
 
@@ -1532,7 +1532,7 @@ cat > $kernel_files-postun <<EOF
 rm -f /boot/initrd-$KernelVer.img
 rm -f /boot/initrd-$KernelVer_old.img
 # Remove /lib/modules/<...>/ if it is empty (-devel uses it too).
-find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \;
+find /lib/modules/$KernelVer -maxdepth 0 -empty -exec rm -rf {} \; || true
 EOF
 }