diff --git a/pisi/archive.py b/pisi/archive.py
index d31890a4..138cf809 100644
--- a/pisi/archive.py
+++ b/pisi/archive.py
@@ -22,11 +22,10 @@ class ArchiveBase(object):
     def unpack(self, targetDir, cleanDir = False):
         self.targetDir = targetDir
         # first we check if we need to clean-up our working env.
-        if os.path.exists(self.targetDir):
-            if cleanDir:
-                util.clean_dir(self.targetDir)
-        else:
-            os.makedirs(self.targetDir)
+        if os.path.exists(self.targetDir) and cleanDir:
+            util.clean_dir(self.targetDir)
+
+        os.makedirs(self.targetDir)
 
 class ArchiveTar(ArchiveBase):
     """ArchiveTar handles tar archives depending on the compression
diff --git a/pisi/sourcearchive.py b/pisi/sourcearchive.py
index da96ad63..8b1b8ecd 100644
--- a/pisi/sourcearchive.py
+++ b/pisi/sourcearchive.py
@@ -46,6 +46,6 @@ class SourceArchive:
 
         return False
 
-    def unpack(self, cleanDir=False):
+    def unpack(self, cleanDir=True):
         archive = Archive(self.dest, self.ctx.spec.source.archiveType)
         archive.unpack(self.ctx.pkg_work_dir(), cleanDir)