diff --git a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py
index ab1568da..1ba40095 100644
--- a/pisi/actionsapi/kerneltools.py
+++ b/pisi/actionsapi/kerneltools.py
@@ -105,9 +105,6 @@ def install():
         pisitools.remove("/lib/modules/%s/source" % suffix)
         pisitools.remove("/lib/modules/%s/build" % suffix)
 
-        # Remove modules.* files, they will autogenerated on next boot
-        # TODO: Ubuntu doesn't remove modules.order, reinvestigate.
-        pisitools.remove("/lib/modules/%s/modules.*" % suffix)
 
 
     # Install kernel image
@@ -164,6 +161,12 @@ def installSource():
     autotools.make("clean")
     autotools.make("modules_prepare")
 
+def cleanModuleFiles():
+    """ Cleans module.* files generated by depmod """
+    # Remove modules.* files, they will be autogenerated during pakhandler.
+    # TODO: Ubuntu doesn't remove modules.order, reinvestigate.
+    pisitools.remove("/lib/modules/%s/modules.*" % __getSuffix())
+
 def mkinitramfs():
     """ Create and install the initramfs image into the package. This will hopefully be done on user's system. """
-    shelltools.system("/sbin/mkinitramfs kernel=%s --full --root-dir=%s --output=/%s/boot" % (__getSuffix(), get.installDIR(), get.installDIR()))
+    shelltools.system("/sbin/mkinitramfs kernel=%s --full --root-dir=%s --output=%s/boot" % (__getSuffix(), get.installDIR(), get.installDIR()))