diff --git a/pisi/build.py b/pisi/build.py
index 5ed1345c..7649e282 100644
--- a/pisi/build.py
+++ b/pisi/build.py
@@ -663,7 +663,7 @@ class Builder:
                 except Error:
                     ctx.ui.warning('Package file %s may be corrupt. Skipping.' % old_package_fn)
 
-        for root, dirs, files in os.walk(ctx.config.packages_dir()):
+        for root, dirs, files in os.walk(ctx.config.compiled_packages_dir()):
             for file in files:
                 locate_old_package(join(root,file))
 
diff --git a/pisi/configfile.py b/pisi/configfile.py
index 5f3d8bf4..cadaa0b8 100644
--- a/pisi/configfile.py
+++ b/pisi/configfile.py
@@ -38,6 +38,7 @@
 #db_dir = /var/db/pisi
 #archives_dir = /var/cache/pisi/archives
 #packages_dir = /var/cache/pisi/packages
+#compiled_packages_dir = "/var/cache/pisi/packages"
 #index_dir = /var/cache/pisi/index
 #tmp_dir = /var/tmp/pisi
 #kde_dir = /usr/kde/3.5
@@ -84,6 +85,7 @@ class DirectoriesDefaults:
     db_dir = "/var/db/pisi"
     archives_dir = "/var/cache/pisi/archives"
     packages_dir = "/var/cache/pisi/packages"
+    compiled_packages_dir = "/var/cache/pisi/packages"
     index_dir = "/var/lib/pisi/index"
     tmp_dir =  "/var/pisi"
     kde_dir = "/usr/kde/3.5"
diff --git a/pisi/util.py b/pisi/util.py
index 6ff47413..f41b5c5c 100644
--- a/pisi/util.py
+++ b/pisi/util.py
@@ -468,6 +468,8 @@ def uncompress(patchFile, compressType="gz", targetDir=None):
                                 os.path.basename(patchFile))
     else:
         filePath = os.path.basename(patchFile)
+    # remove suffix from file cause its uncompressed now
+    filePath = filePath.split(".%s" % compressType)[0]
 
     if compressType == "gz":
         from gzip import GzipFile