diff --git a/buildout/software-profiles/bzip2.cfg b/buildout/software-profiles/bzip2.cfg
index 63693c8cdee54b9bb69252c31a99ca7b29d0c3c7..7efa1d00fd07fec0617d01286189ca40b6dcd136 100644
--- a/buildout/software-profiles/bzip2.cfg
+++ b/buildout/software-profiles/bzip2.cfg
@@ -1,7 +1,4 @@
 [buildout]
-extends =
-  ../profiles/links.cfg
-
 parts =
   bzip2
 
diff --git a/buildout/software-profiles/gdbm.cfg b/buildout/software-profiles/gdbm.cfg
index 7d6ae32c371db75f86a91ba11334492fc8f3fd20..d151883ea8252e1a246d2601d26e34e815af9b48 100644
--- a/buildout/software-profiles/gdbm.cfg
+++ b/buildout/software-profiles/gdbm.cfg
@@ -1,7 +1,4 @@
 [buildout]
-extends =
-  ../profiles/links.cfg
-
 parts =
   gdbm
 
diff --git a/buildout/software-profiles/libdb.cfg b/buildout/software-profiles/libdb.cfg
index 416f9c8f952a46c622039dddc13e678a80ea0ef9..99e1586bbd197d7d178a2c667761b177f52d24e3 100644
--- a/buildout/software-profiles/libdb.cfg
+++ b/buildout/software-profiles/libdb.cfg
@@ -1,7 +1,4 @@
 [buildout]
-extends =
-  ../profiles/links.cfg
-
 parts = libdb
 
 [libdb-hooks-download]
diff --git a/buildout/software-profiles/libreoffice-bin.cfg b/buildout/software-profiles/libreoffice-bin.cfg
index edcea4f9138f6de789296c62c05db42b7a5aab0c..c83e49502a9839453c1ae53e1fae3b0416caec59 100644
--- a/buildout/software-profiles/libreoffice-bin.cfg
+++ b/buildout/software-profiles/libreoffice-bin.cfg
@@ -1,8 +1,10 @@
 [buildout]
-extends = ../profiles/links.cfg
 parts =
   libreoffice-bin
 
+find-links =
+  http://www.nexedi.org/static/packages/source/
+
 [libreoffice-bin]
 recipe = z3c.recipe.openoffice
 install-javafilter = no
diff --git a/buildout/software-profiles/ncurses.cfg b/buildout/software-profiles/ncurses.cfg
index be1f9f285de84e6efb8b5dff161d3589a54a1db9..d0e81da39765b0050bc2643d771173a882f5669c 100644
--- a/buildout/software-profiles/ncurses.cfg
+++ b/buildout/software-profiles/ncurses.cfg
@@ -1,6 +1,4 @@
 [buildout]
-extends =
-  ../profiles/links.cfg
 parts =
   ncurses
 
diff --git a/buildout/software-profiles/openoffice-bin.cfg b/buildout/software-profiles/openoffice-bin.cfg
index 16b430130b10d361dc7e9d8ea8656d2dd04a20e2..49737a30936d246be6989b7314f724fc1b1027c1 100644
--- a/buildout/software-profiles/openoffice-bin.cfg
+++ b/buildout/software-profiles/openoffice-bin.cfg
@@ -1,7 +1,8 @@
 [buildout]
-extends = ../profiles/links.cfg
 parts =
   openoffice-bin
+find-links =
+  http://www.nexedi.org/static/packages/source/
 
 [openoffice-bin]
 # XXX: This section and recipe have to be reviewed against using
diff --git a/buildout/software-profiles/openssl.cfg b/buildout/software-profiles/openssl.cfg
index bfe08143437859f8f434f306d5febed9f582d7a3..bda52071584ac7ce8f552aafc58f1b0805109adf 100644
--- a/buildout/software-profiles/openssl.cfg
+++ b/buildout/software-profiles/openssl.cfg
@@ -6,7 +6,6 @@
 [buildout]
 extends =
   zlib.cfg
-  ../profiles/links.cfg
 
 parts =
   openssl
diff --git a/buildout/software-profiles/python-2.4.cfg b/buildout/software-profiles/python-2.4.cfg
index 94a168ed34b65759f556549538b9d13053483a7c..f079649dd31922ec6340b06bf98bafa8b847814f 100644
--- a/buildout/software-profiles/python-2.4.cfg
+++ b/buildout/software-profiles/python-2.4.cfg
@@ -1,4 +1,5 @@
 [buildout]
+# XXX: Extends shall not jump out of software
 extends =
   bzip2.cfg
   gdbm.cfg
diff --git a/buildout/software-profiles/python-2.6.cfg b/buildout/software-profiles/python-2.6.cfg
index a59c31a4cb54aa68ed5d647e5cff2dae91ee033e..4b770910cb977771121c76d3a5ef1ad753c93628 100644
--- a/buildout/software-profiles/python-2.6.cfg
+++ b/buildout/software-profiles/python-2.6.cfg
@@ -1,4 +1,5 @@
 [buildout]
+# XXX: Extends shall not jump out of software
 extends =
   bzip2.cfg
   gdbm.cfg
diff --git a/buildout/software-profiles/python-2.7.cfg b/buildout/software-profiles/python-2.7.cfg
index 2a05ba5e460b670fcdd2dd7fbbef2a27fe99e4ad..4387a848aad8e8b3377e0f03d91e0c9efacecb44 100644
--- a/buildout/software-profiles/python-2.7.cfg
+++ b/buildout/software-profiles/python-2.7.cfg
@@ -1,4 +1,5 @@
 [buildout]
+# XXX: Extends shall not jump out of software
 extends =
   bzip2.cfg
   gdbm.cfg
diff --git a/buildout/software-profiles/readline.cfg b/buildout/software-profiles/readline.cfg
index 2debd243fb98dcc3a92cd16603f769d47fc21c44..b60f27c0eb3e4e8db1c5bd9dfe4708dfa9dd2d16 100644
--- a/buildout/software-profiles/readline.cfg
+++ b/buildout/software-profiles/readline.cfg
@@ -3,7 +3,6 @@ parts =
   readline
 extends =
   ncurses.cfg
-  ../profiles/links.cfg
 
 [readline]
 recipe = hexagonit.recipe.cmmi
diff --git a/buildout/software-profiles/sqlite3.cfg b/buildout/software-profiles/sqlite3.cfg
index 32a09b5765e27209ff64631b1bff98e614f3cf7f..4812b068f43aa51e7647dff2167ae3e97733608a 100644
--- a/buildout/software-profiles/sqlite3.cfg
+++ b/buildout/software-profiles/sqlite3.cfg
@@ -1,6 +1,4 @@
 [buildout]
-extends =
-  ../profiles/links.cfg
 parts =
   sqlite3
 
diff --git a/buildout/software-profiles/zlib.cfg b/buildout/software-profiles/zlib.cfg
index ab451d127383890c3c950293af6e77a5d39f2f51..3afcf1f80d48f48101c70cdeab6f5bc4228b895f 100644
--- a/buildout/software-profiles/zlib.cfg
+++ b/buildout/software-profiles/zlib.cfg
@@ -1,6 +1,4 @@
 [buildout]
-extends =
-  ../profiles/links.cfg
 parts =
   zlib