diff --git a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py
index b8fa7847..bcba8b37 100644
--- a/pisi/actionsapi/kerneltools.py
+++ b/pisi/actionsapi/kerneltools.py
@@ -196,14 +196,15 @@ def installSource():
     shelltools.cd(os.path.join(get.installDIR(), destination))
     autotools.make("clean")
     autotools.make("modules_prepare")
-    shelltools.system("find . -path './.*' -exec rm -f '{}' \;")
+    shelltools.system("find . -path './.*' -exec rm -rf '{}' \;")
 
 def cleanModuleFiles():
     """ Cleans module.* files generated by depmod """
     # Remove modules.* files, they will be autogenerated during pakhandler.
     # Don't remove modules.order generated by kbuild for ordering the modules
     # according to the link order.
-    shelltools.system("find . -name 'modules.*' -not -name 'modules.order' -exec rm -f '{}' \;")
+    shelltools.system("find %s/lib/modules/%s -name 'modules.*' \
+                       -not -name 'modules.order' -exec rm -f '{}' \;" % (get.installDIR(), __getSuffix()))
 
 def mkinitramfs():
     """ Create and install the initramfs image into the package. This will hopefully be done on user's system. """