diff --git a/.gitignore b/.gitignore
index 8f45fdf..0cd259f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,6 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# Temporary folder
+.mkrepo/
diff --git a/README.md b/README.md
index 9796cab..e83b0ab 100644
--- a/README.md
+++ b/README.md
@@ -33,13 +33,17 @@ Python libraries:
 So you may skip them in command line invocation in case you have aws config.
 
 ``` bash
-mkrepo.py [-h] [--s3-access-key-id S3_ACCESS_KEY_ID]
-          [--s3-secret-access-key S3_SECRET_ACCESS_KEY]
-          [--s3-endpoint S3_ENDPOINT] [--s3-region S3_REGION]
-          [--sign]
-          path [path ...]
+  mkrepo.py [-h] 
+            [--temp-dir TEMP_DIR]
+            [--s3-access-key-id S3_ACCESS_KEY_ID]
+            [--s3-secret-access-key S3_SECRET_ACCESS_KEY]
+            [--s3-endpoint S3_ENDPOINT]
+            [--s3-region S3_REGION]
+            [--sign]
+            path [path ...]
 ```
 
+* `--temp-dir` - /(optional)/directory used to store temporary artifacts (default is ./.mkrepo)
 * `--s3-access-key-id` - /(optional)/ specify S3 access key ID
 * `--s3-secret-access-key` - /(optional)/ specify S3 secret key
 * `--s3-endpoint` - /(optional)/ specify S3 server URI
diff --git a/debrepo.py b/debrepo.py
index 9d61e54..e343464 100755
--- a/debrepo.py
+++ b/debrepo.py
@@ -253,15 +253,6 @@ def split_pkg_path(pkg_path):
 
     component = 'main'
 
-    #package = match.group('package')
-    # if package is None:
-    #    package = 'none'
-    #version = match.group('version')
-    # if version is None:
-    #    version = '0.0.0-0'
-    #revision = match.group('revision')
-    # if revision is None:
-    #    revision = ''
     dist = match.group('dist')
     if dist is None:
         dist = 'all'
diff --git a/index.html b/index.html
index b9dd68a..56f9e48 100644
--- a/index.html
+++ b/index.html
@@ -103,7 +103,7 @@ <h2 id="command-line-reference">Command-line reference</h2>
           [<span class="kw">--sign</span>]
           <span class="kw">path</span> [path ...]</code></pre></div>
 <ul>
-<li><code>--temp-dir</code> - /(optional)/directory used to store temporary artifacts</li>
+<li><code>--temp-dir</code> - /(optional)/directory used to store temporary artifacts (default is ./.mkrepo)</li>
 <li><code>--s3-access-key-id</code> - /(optional)/ specify S3 access key ID</li>
 <li><code>--s3-secret-access-key</code> - /(optional)/ specify S3 secret key</li>
 <li><code>--s3-endpoint</code> - /(optional)/ specify S3 server URI</li>
diff --git a/mkrepo.py b/mkrepo.py
index 3b0819d..4fd081b 100755
--- a/mkrepo.py
+++ b/mkrepo.py
@@ -60,7 +60,7 @@ def main():
 
     parser.add_argument(
         '--temp-dir',
-        default=None,
+        default="./.mkrepo",
         help='directory used to store temporary artifacts'
     )
 
diff --git a/rpmrepo.py b/rpmrepo.py
index 6a682fe..5fe1f27 100755
--- a/rpmrepo.py
+++ b/rpmrepo.py
@@ -23,7 +23,7 @@
 
 try:
     import xml.etree.cElementTree as ET
-except BaseException:
+except ImportError:
     import xml.etree.ElementTree as ET
 
 
@@ -93,12 +93,12 @@ def sign_metadata(repomdfile):
         exit(1)
 
 
-def setup_repository(repo):
+def setup_repository(repo, tempdir):
     """Make sure a repo is present at repopath"""
     if repo._grab.storage.exists("repodata/repomd.xml"):
         return
 
-    tmpdir = tempfile.mkdtemp()
+    tmpdir = tempfile.mkdtemp('', 'tmp', tempdir)
     cmd = ['createrepo', '--no-database', tmpdir]
     subprocess.check_output(cmd)
     repo._grab.syncdir(os.path.join(tmpdir, "repodata"), "repodata")