diff --git a/firstboot/modules/qubes_setup.py b/firstboot/modules/qubes_setup.py
index b2e9bfc..233905a 100644
--- a/firstboot/modules/qubes_setup.py
+++ b/firstboot/modules/qubes_setup.py
@@ -196,7 +196,7 @@ class moduleClass(Module):
         subprocess.check_call(['/etc/init.d/qubes_netvm', 'start'])
 
     def do_configure_template(self):
-        subprocess.check_call(['/bin/mkdir', '/mnt/template-root'])
+        subprocess.check_call(['/bin/mkdir', '-p', '/mnt/template-root'])
         subprocess.check_call(['/bin/mount', '-oloop',
             '/var/lib/qubes/vm-templates/fedora-14-x64/root.img',
             '/mnt/template-root'])