diff --git a/fdroid b/fdroid
index d29841d7..13ec03e3 100755
--- a/fdroid
+++ b/fdroid
@@ -18,6 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
+import os
 
 commands = [
         "build",
@@ -49,6 +50,10 @@ def main():
         print_help()
         sys.exit(1)
 
+    for basedir in ('metadata', 'tmp'):
+        if not os.path.exists(basedir):
+             os.makedirs(basedir)
+
     # Trick optparse into displaying the right usage when --help is used.
     sys.argv[0] += ' ' + command