diff --git a/manifests/init.pp b/manifests/init.pp
index 59bcd3f..8b2b5ec 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -146,6 +146,11 @@ class zuul (
     ensure => directory,
   }
 
+  file { '/etc/zuul/layout':
+    ensure  => directory,
+    require => File['/etc/zuul'],
+  }
+
 # TODO: We should put in  notify either Service['zuul'] or Exec['zuul-reload']
 #       at some point, but that still has some problems.
   file { '/etc/zuul/zuul.conf':
diff --git a/templates/zuul.conf.erb b/templates/zuul.conf.erb
index b158443..1c3b081 100644
--- a/templates/zuul.conf.erb
+++ b/templates/zuul.conf.erb
@@ -14,7 +14,7 @@ baseurl=<%= gerrit_baseurl %>
 <% end -%>
 
 [zuul]
-layout_config=/etc/zuul/layout.yaml
+layout_config=/etc/zuul/layout/layout.yaml
 log_config=/etc/zuul/logging.conf
 state_dir=/var/lib/zuul
 git_dir=/var/lib/zuul/git