diff --git a/buildout.cfg b/buildout.cfg
index fafa7ab93693542978b3425f63a31fc92e66a3f6..d1166140a9a079c9a56da49ae2b43d3762548133 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -3,29 +3,24 @@
 ; Mon 16 Apr 08:29:18 2012 CEST
 
 [buildout]
-parts = xbob.blitz xbob.io scripts
+parts = scripts
 eggs = xbob.io
-       ipdb
-extensions = mr.developer
+extensions = xbob.buildout
+             mr.developer
 auto-checkout = *
-;prefixes = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release
-prefixes = /Users/andre/work/bob/b/dbg
+develop = src/xbob.extension
+          src/xbob.blitz
+          .
+
+; options for xbob.buildout extension
 debug = true
 verbose = true
+;prefixes = /Users/andre/work/bob/b/dbg/
+prefixes = /idiap/group/torch5spro/nightlies/last/bob/linux-x86_64-release
 
 [sources]
-xbob.buildout = git git@github.com:bioidiap/xbob.buildout
-xbob.extension = git git@github.com:bioidiap/xbob.extension branch=xbob
-xbob.blitz = git git@github.com:bioidiap/xbob.blitz egg=false
-
-[xbob.blitz]
-recipe = xbob.buildout:develop
-setup = src/xbob.blitz
-eggs = xbob.buildout xbob.extension
-
-[xbob.io]
-recipe = xbob.buildout:develop
-eggs = xbob.blitz
+xbob.extension = git git@github.com:bioidiap/xbob.extension branch=prototype
+xbob.blitz = git git@github.com:bioidiap/xbob.blitz
 
 [scripts]
 recipe = xbob.buildout:scripts