diff --git a/buildout.cfg b/buildout.cfg
index 276d2f01a1c8b2381102e8ec536708ae3f292be7..6fb286b202499e5d4958a1566f46abab8238ec65 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -3,32 +3,41 @@
 ; Mon 16 Apr 08:29:18 2012 CEST
 
 [buildout]
-parts = external python tests sphinx
+parts = external tests sphinx python
 develop = .
-eggs = bob.db.replay
-versions = versions
 index = http://d.pypi.python.org/simple
+versions = versions
+
+;You are not obliged to set the version of Bob to use. However, note that
+;buildout in this case will choose the default version installed looking at the
+;current sys.path settings. Also note that your current 'eggs' directory may
+;not take precedence over that.
+eggs = bob==master
+       bob.db.replay
 
 [versions]
-;idiap.recipe.externaleggs = 0.1
-;idiap.recipe.sphinx = 0.1
+;If you would like to pin-down the recipes package version so you are not
+;bothered with eventual updates, do it here. Note that, by pinning the version
+;of the package, you will be also excluded from bug fixes.
+;bob.buildout.recipes = 0.1
 
 [external]
-recipe = idiap.recipe.externaleggs:recipe
+recipe = bob.buildout.recipes:external
 egg-directories = /Users/andre/work/bob-master/build/lib
 
-[python]
-recipe = z3c.recipe.scripts
-interpreter = python
-eggs = ${buildout:eggs}
-
 [tests]
-recipe = pbp.recipe.noserunner
+recipe = bob.buildout.recipes:nose
 eggs = ${buildout:eggs}
 script = tests.py
 
 [sphinx]
-recipe = idiap.recipe.sphinx:recipe
+recipe = bob.buildout.recipes:sphinx
 eggs = ${buildout:eggs}
 source = ${buildout:directory}/docs
 build = ${buildout:directory}/sphinx
+
+[python]
+recipe = z3c.recipe.scripts
+interpreter = python
+eggs = ${buildout:eggs}
+dependent-scripts = true