diff --git a/buildout.cfg b/buildout.cfg
index afd4fb1..1a0027c 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -13,7 +13,7 @@ include-site-packages = false
 auto-checkout =
   grok
   grokcore.chameleon
-  grokcore.layout
+  grokcore.startup
   z3c.autoinclude
   zope.app.debug
 
diff --git a/grok.cfg b/grok.cfg
index 021d84a..094ab45 100644
--- a/grok.cfg
+++ b/grok.cfg
@@ -46,7 +46,7 @@ grokcore.component = 3.0
 grokcore.content = 3.0.1
 grokcore.formlib = 3.0.0
 grokcore.json = 3.0.2
-grokcore.layout = 1.6.1
+grokcore.layout = 3.0.0
 grokcore.message = 0.4.3
 grokcore.rest = 3.0.0
 grokcore.security = 3.0.0
@@ -115,12 +115,12 @@ grokcore.component = git ${buildout:github}/grokcore.component pushurl=${buildou
 grokcore.content = git ${buildout:github}/grokcore.content pushurl=${buildout:github_push}/grokcore.content
 grokcore.formlib = git ${buildout:github}/grokcore.formlib pushurl=${buildout:github_push}/grokcore.formlib
 grokcore.json = git ${buildout:github}/grokcore.json pushurl=${buildout:github_push}/grokcore.json
-grokcore.layout = git ${buildout:github}/grokcore.layout pushurl=${buildout:github_push}/grokcore.layout branch=resurrection-python3
+grokcore.layout = git ${buildout:github}/grokcore.layout pushurl=${buildout:github_push}/grokcore.layout
 grokcore.message = git ${buildout:github}/grokcore.message pushurl=${buildout:github_push}/grokcore.message
 grokcore.rest = git ${buildout:github}/grokcore.rest pushurl=${buildout:github_push}/grokcore.rest
 grokcore.security = git ${buildout:github}/grokcore.security pushurl=${buildout:github_push}/grokcore.security
 grokcore.site = git ${buildout:github}/grokcore.site pushurl=${buildout:github_push}/grokcore.site
-grokcore.startup = git ${buildout:github}/grokcore.startup pushurl=${buildout:github_push}/grokcore.startup
+grokcore.startup = git ${buildout:github}/grokcore.startup pushurl=${buildout:github_push}/grokcore.startup branch=resurrection-python3
 grokcore.traverser = git ${buildout:github}/grokcore.traverser pushurl=${buildout:github_push}/grokcore.traverser
 grokcore.view = git ${buildout:github}/grokcore.view pushurl=${buildout:github_push}/grokcore.view
 grokcore.viewlet = git ${buildout:github}/grokcore.viewlet pushurl=${buildout:github_push}/grokcore.viewlet