diff --git a/jeepyb/cmd/create_cgitrepos.py b/jeepyb/cmd/create_cgitrepos.py
index d8da88b..8bd12e6 100644
--- a/jeepyb/cmd/create_cgitrepos.py
+++ b/jeepyb/cmd/create_cgitrepos.py
@@ -16,6 +16,9 @@
 # create_cgitrepos.py reads the project config file called projects.yaml
 # and generates a cgitrepos configuration file which is then copied to
 # the cgit server.
+#
+# It also creates the necessary top-level directories for each project
+# organization (openstack, stackforge, etc)
 
 import os
 import yaml
@@ -39,6 +42,9 @@ def main():
         assert name not in names
         names.add(name)
         gitorgs.setdefault(org, []).append((name, description))
+    for org in gitorgs:
+        if not os.path.isdir('%s/%s' % (REPO_PATH, org)):
+            os.makedirs('%s/%s' % (REPO_PATH, org))
     with open(CGIT_REPOS, 'w') as cgit_file:
         cgit_file.write('# Autogenerated by create_cgitrepos.py\n')
         for org in sorted(gitorgs):