diff --git a/pisi/build.py b/pisi/build.py
index 3540815a..95942a02 100644
--- a/pisi/build.py
+++ b/pisi/build.py
@@ -562,3 +562,10 @@ class Builder:
             self.set_state("buildpackages")
             util.xterm_title_reset()
             ctx.ui.info(_("Done."))
+           
+            if ctx.config.values.general.autoclean is True:
+                ctx.ui.info(_("Cleaning Build Directory..."))
+                util.clean_dir(self.bctx.pkg_dir())
+            else:
+                ctx.ui.info(_("Keeping Build Directory"))
+    
diff --git a/pisi/configfile.py b/pisi/configfile.py
index eeea74dc..6a7cd5a4 100644
--- a/pisi/configfile.py
+++ b/pisi/configfile.py
@@ -19,6 +19,7 @@
 #
 #[general]
 #destinationdirectory = /tmp
+#autoclean = False
 #
 #[build]
 #host = i686-pc-linux-gnu
@@ -51,6 +52,7 @@ class GeneralDefaults:
     """Default values for [general] section"""
 #    destinationdirectory = os.getcwd() + "/tmp" # FOR ALPHA
     destinationdirectory = "/"
+    autoclean = True
     distribution = "Pardus"
     distribution_release = "0.1"