diff --git a/pisi/actionsapi/kerneltools.py b/pisi/actionsapi/kerneltools.py
index 0e22b891..e52cee20 100644
--- a/pisi/actionsapi/kerneltools.py
+++ b/pisi/actionsapi/kerneltools.py
@@ -12,6 +12,7 @@
 # Standard Python Modules
 import os
 import re
+import shutil
 
 import gettext
 __trans = gettext.translation('pisi', fallback=True)
@@ -62,8 +63,10 @@ def __get_workdir_for_module(mod):
 # Set WorkDir for kernel modules
 #####
 
-if not globals().has_key("WorkDir") and get.srcNAME().startswith("module-"):
-    globals()['WorkDir'] = __get_workdir_for_module(get.srcNAME())
+def setModuleWorkDIR():
+    if get.srcNAME().startswith("module-"):
+        globals()['WorkDir'] = __get_workdir_for_module(get.srcNAME())
+
 
 #################
 # Other helpers #
@@ -109,6 +112,7 @@ def __getExtraVersion():
 # Configuration stuff #
 #######################
 
+
 def configure():
     # Set EXTRAVERSION
     extraversion = __getExtraVersion()