diff --git a/component/perl-Crypt-SSLeay/buildout.cfg b/component/perl-Crypt-SSLeay/buildout.cfg
deleted file mode 100644
index 9373ae1134d4d4caee615bf0d165475ab249bbed..0000000000000000000000000000000000000000
--- a/component/perl-Crypt-SSLeay/buildout.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../component/zlib/buildout.cfg
-parts =
-  perl-Crypt-SSLeay
-
-[perl-Crypt-SSLeay]
-recipe = slapos.recipe.build:cpan
-modules =
-  G/GA/GAAS/URI-1.60.tar.gz
-  N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
-cpan-configuration =
-  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${openssl:location}/lib -Wl,-R${openssl:location}/lib"')
-  makepl_arg=('INC=-I${openssl:location}/include')
-environment =
-  OPENSSL_PREFIX=${openssl:location}
-perl = perl
-
diff --git a/component/perl-DBD-Pg/buildout.cfg b/component/perl-DBD-Pg/buildout.cfg
deleted file mode 100644
index baa450d32454236c8f1b591317ad6cf1e7d3cf1b..0000000000000000000000000000000000000000
--- a/component/perl-DBD-Pg/buildout.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../postgresql/buildout.cfg
-parts =
-  perl-DBD-Pg
-
-[perl-DBD-Pg]
-recipe = slapos.recipe.build:cpan
-modules =
-  T/TU/TURNSTEP/DBD-Pg-2.19.3.tar.gz
-environment =
-  POSTGRES_HOME=${postgresql:location}
-perl = perl
diff --git a/component/perl-Search-Xapian/buildout.cfg b/component/perl-Search-Xapian/buildout.cfg
deleted file mode 100644
index f7d72e07cdb63165b6777184271725939a6a2f31..0000000000000000000000000000000000000000
--- a/component/perl-Search-Xapian/buildout.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../xapian/buildout.cfg
-parts =
-  perl-Search-Xapian
-
-[perl-Search-Xapian]
-recipe = slapos.recipe.build:cpan
-modules =
-  O/OL/OLLY/Search-Xapian-1.2.10.0.tar.gz
-environment =
-  XAPIAN_CONFIG=${xapian:location}/bin/xapian-config
-perl = perl
diff --git a/component/perl-Text-Iconv/buildout.cfg b/component/perl-Text-Iconv/buildout.cfg
deleted file mode 100644
index 013c01239c1c1000117357bc8be12cba544ab442..0000000000000000000000000000000000000000
--- a/component/perl-Text-Iconv/buildout.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../libiconv/buildout.cfg
-parts = perl-Text-Iconv
-
-[perl-Text-Iconv]
-recipe = slapos.recipe.build:cpan
-cpan-configuration =
-  makepl_arg='LIBS="-L${libiconv:location}/lib -Wl,-R${libiconv:location}/lib" INC="-I${libiconv:location}/include"'
-modules =
-  M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
-perl = perl
diff --git a/component/perl-XML-LibXSLT/buildout.cfg b/component/perl-XML-LibXSLT/buildout.cfg
deleted file mode 100644
index 825e44260e89d80f9a6db5e9475f814a0a2e34a1..0000000000000000000000000000000000000000
--- a/component/perl-XML-LibXSLT/buildout.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[buildout]
-extends =
-  ../perl/buildout.cfg
-  ../libxslt/buildout.cfg
-  ../libxml2/buildout.cfg
-  ../zlib/buildout.cfg
-parts = perl-XML-LibXSLT
-
-[perl-XML-LibXSLT]
-recipe = slapos.recipe.build:cpan
-cpan-configuration =
-  makepl_arg='LIBS="-L${libxslt:location}/lib -Wl,-R${libxslt:location}/lib -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libxml2:location}/lib -Wl,-R${libxml2:location}/lib" INC="-I${libxslt:location}/include -I${libxml2:location}/include/libxml2"'
-modules =
-  S/SH/SHLOMIF/XML-LibXSLT-1.78.tar.gz
-perl = perl
diff --git a/software/unstable/mioga/software.cfg b/software/unstable/mioga/software.cfg
index a65fe1908d535a73b5e1fd822deb85088c95f03b..39a3a68777b07c33f103a56438e43fe1fe985b4f 100644
--- a/software/unstable/mioga/software.cfg
+++ b/software/unstable/mioga/software.cfg
@@ -6,16 +6,11 @@ develop =
 extends =
   ../../component/rsync/buildout.cfg
   ../../component/apache-perl/buildout.cfg
-  ../../component/perl-Crypt-SSLeay/buildout.cfg
   ../../component/perl-XML-Parser/buildout.cfg
   ../../component/perl-XML-LibXML/buildout.cfg
-  ../../component/perl-XML-LibXSLT/buildout.cfg
   ../../component/perl-Term-ReadLine-Gnu/buildout.cfg
-  ../../component/perl-Text-Iconv/buildout.cfg
   ../../component/perl-Image-Magick/buildout.cfg
   ../../component/postgresql/buildout.cfg
-  ../../component/perl-DBD-Pg/buildout.cfg
-  ../../component/perl-Search-Xapian/buildout.cfg
   ../../component/libxslt/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/dropbear/buildout.cfg
@@ -43,6 +38,79 @@ parts =
   template-apacheperl
   template-postgres
 
+
+# Those were unmaintained components inlined here
+# slapos.recipe.build:cpan no longer exist, we now use perl-CPAN-package macro instead
+
+# ../../component/perl-Crypt-SSLeay/buildout.cfg
+[buildout]
+extends +=
+  ../../component/openssl/buildout.cfg
+  ../../component/zlib/buildout.cfg
+[perl-Crypt-SSLeay]
+recipe = slapos.recipe.build:cpan
+modules =
+  G/GA/GAAS/URI-1.60.tar.gz
+  N/NA/NANIS/Crypt-SSLeay-0.64.tar.gz
+cpan-configuration =
+  make_arg=('OTHERLDFLAGS="-L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${openssl:location}/lib -Wl,-R${openssl:location}/lib"')
+  makepl_arg=('INC=-I${openssl:location}/include')
+environment =
+  OPENSSL_PREFIX=${openssl:location}
+perl = perl
+
+# ../../component/perl-XML-LibXSLT/buildout.cfg
+[buildout]
+extends +=
+  ../libxslt/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../zlib/buildout.cfg
+[perl-XML-LibXSLT]
+recipe = slapos.recipe.build:cpan
+cpan-configuration =
+  makepl_arg='LIBS="-L${libxslt:location}/lib -Wl,-R${libxslt:location}/lib -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libxml2:location}/lib -Wl,-R${libxml2:location}/lib" INC="-I${libxslt:location}/include -I${libxml2:location}/include/libxml2"'
+modules =
+  S/SH/SHLOMIF/XML-LibXSLT-1.78.tar.gz
+perl = perl
+
+# ../../component/perl-Text-Iconv/buildout.cfg
+[buildout]
+extends +=
+  ../libiconv/buildout.cfg
+[perl-Text-Iconv]
+recipe = slapos.recipe.build:cpan
+cpan-configuration =
+  makepl_arg='LIBS="-L${libiconv:location}/lib -Wl,-R${libiconv:location}/lib" INC="-I${libiconv:location}/include"'
+modules =
+  M/MP/MPIOTR/Text-Iconv-1.7.tar.gz
+perl = perl
+
+# ../../component/perl-DBD-Pg/buildout.cfg
+[buildout]
+extends +=
+  ../postgresql/buildout.cfg
+[perl-DBD-Pg]
+recipe = slapos.recipe.build:cpan
+modules =
+  T/TU/TURNSTEP/DBD-Pg-2.19.3.tar.gz
+environment =
+  POSTGRES_HOME=${postgresql:location}
+perl = perl
+
+# ../../component/perl-Search-Xapian/buildout.cfg
+[buildout]
+extends +=
+  ../xapian/buildout.cfg
+[perl-Search-Xapian]
+recipe = slapos.recipe.build:cpan
+modules =
+  O/OL/OLLY/Search-Xapian-1.2.10.0.tar.gz
+environment =
+  XAPIAN_CONFIG=${xapian:location}/bin/xapian-config
+perl = perl
+
+
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =