diff --git a/buildout/official.cfg b/buildout/official.cfg
index 8910fecf0494b76e15d8f8c3b75bdb01d6a14bc8..ba9a131e7522901cf1f0d924505dbae79d0248d1 100644
--- a/buildout/official.cfg
+++ b/buildout/official.cfg
@@ -46,10 +46,15 @@ parts =
   products-other
   products-deps
   products-erp5
+  products-development
   bt5-erp5
   openoffice-bin
   oood
 
+[configuration]
+erp5_products_revision =
+erp5_bt5_revision = ${:erp5_products_revision}
+
 [show-requirements]
 recipe = plone.recipe.command
 command =
diff --git a/buildout/software-profiles/erp5.cfg b/buildout/software-profiles/erp5.cfg
index eb253cd25ac73d137437c58fdadd07b96f93329e..cb2fdd24090364588f5932a69c223d34551b33fc 100644
--- a/buildout/software-profiles/erp5.cfg
+++ b/buildout/software-profiles/erp5.cfg
@@ -12,37 +12,13 @@ parts =
 recipe = infrae.subversion
 base = https://svn.erp5.org/repos/public/erp5/trunk/bt5
 ignore_verification = true
-revision = 
+revision = ${configuration:erp5_bt5_revision}
 public_bootstrap = ${products-erp5:base}/ERP5/bootstrap
 urls =
-  ${:base}/erp5_base/${:revision} erp5_base/
-  ${:base}/erp5_pdm/${:revision} erp5_pdm/
-  ${:base}/erp5_trade/${:revision} erp5_trade/
-  ${:base}/erp5_accounting/${:revision} erp5_accounting/
-  ${:base}/erp5_invoicing/${:revision} erp5_invoicing/
-  ${:base}/erp5_simplified_invoicing/${:revision} erp5_simplified_invoicing/
-  ${:base}/erp5_advanced_invoicing/${:revision} erp5_advanced_invoicing/
-  ${:base}/erp5_ods_style/${:revision} erp5_ods_style/
-  ${:base}/erp5_odt_style/${:revision} erp5_odt_style/
-  ${:base}/erp5_ingestion_mysql_innodb_catalog/${:revision} erp5_ingestion_mysql_innodb_catalog/
-  ${:base}/erp5_ingestion/${:revision} erp5_ingestion/
-  ${:base}/erp5_crm/${:revision} erp5_crm/
-  ${:base}/erp5_web/${:revision} erp5_web/
-  ${:base}/erp5_forge/${:revision} erp5_forge/
-  ${:base}/erp5_dms/${:revision} erp5_dms/
-  ${:base}/erp5_ui_test_core/${:revision} erp5_ui_test_core/
-  ${:base}/erp5_ui_test/${:revision} erp5_ui_test/
-  ${:base}/erp5_pdm_ui_test/${:revision} erp5_pdm_ui_test/
-  ${:base}/erp5_accounting_ui_test/${:revision} erp5_accounting_ui_test/
-  ${:base}/erp5_web_ui_test/${:revision} erp5_web_ui_test/
-  ${:base}/erp5_dms_ui_test/${:revision} erp5_dms_ui_test/
-  ${:base}/erp5_l10n_fr/${:revision} erp5_l10n_fr/
-  ${:base}/erp5_l10n_ja/${:revision} erp5_l10n_ja/
-  ${:base}/erp5_l10n_pl_PL/${:revision} erp5_l10n_pl_PL/
-  ${:base}/erp5_l10n_pt-BR/${:revision} erp5_l10n_pt-BR/
   ${:public_bootstrap}/erp5_core/${:revision} erp5_core
-  ${:public_bootstrap}/erp5_xhtml_style/${:revision} erp5_xhtml_style
   ${:public_bootstrap}/erp5_mysql_innodb_catalog/${:revision} erp5_mysql_innodb_catalog
+  ${:public_bootstrap}/erp5_xhtml_style/${:revision} erp5_xhtml_style
+  ${:base}/${:revision} .
 
 [cmf15]
 recipe = plone.recipe.distros
@@ -81,12 +57,12 @@ version-suffix-packages =
 recipe = infrae.subversion
 ignore_verification = true
 urls =
-    ${products-erp5:base}/ERP5Subversion/${products-erp5:revision} ERP5Subversion
+    ${products-erp5:base}/ERP5Subversion/${configuration:erp5_products_revision} ERP5Subversion
 
 [products-erp5]
 recipe = infrae.subversion
 ignore_verification = true
-revision = 
+revision = ${configuration:erp5_products_revision}
 base = https://svn.erp5.org/repos/public/erp5/trunk/products
 urls =
     ${:base}/CMFActivity/${:revision} CMFActivity