diff --git a/conf/repositories.conf.d/_entropy_sabayon-limbo.example b/conf/repositories.conf.d/_entropy_sabayon-limbo.example
new file mode 100644
index 000000000..f0ec9061e
--- /dev/null
+++ b/conf/repositories.conf.d/_entropy_sabayon-limbo.example
@@ -0,0 +1,11 @@
+# Experimental Sabayon repository "sabayon-limbo"
+# Here you can find in-testing packages that will be merged to
+# the mainline repository soon.
+# You can use any mirror listed for "sabayonlinux.org"
+# repository = sabayon-limbo|Sabayon Limbo Testing Repository|http://cerberus.itti.ifce.edu.br/entropy|http://pkg.sabayon.org,sabayon.org
+# repository = sabayon-limbo||http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/entropy|
+# repository = sabayon-limbo||http://ftp.rnl.ist.utl.pt/pub/sabayon ftp://ftp.rnl.ist.utl.pt/pub/sabayon|
+# repository = sabayon-limbo||http://mirror.internode.on.net/pub/sabayonlinux/entropy|
+# repository = sabayon-limbo||ftp://mirror.aarnet.edu.au/pub/SabayonLinux/entropy|
+# repository = sabayon-limbo||http://cross-lfs.sabayonlinux.org/entropy|
+# repository = sabayon-limbo||http://na.mirror.garr.it/mirrors/sabayonlinux/entropy|
diff --git a/conf/repositories.conf.d/entropy_sabayonlinux.org.example b/conf/repositories.conf.d/entropy_sabayonlinux.org.example
new file mode 100644
index 000000000..e78ea6c45
--- /dev/null
+++ b/conf/repositories.conf.d/entropy_sabayonlinux.org.example
@@ -0,0 +1,87 @@
+#
+#  syntax for repositories (content in square brackets not mandatory):
+#
+#    repository: where the available packages and its database are stored
+#|    repository = repository_id|repository description|<packages mirror 1> <2>|<database uri>[,<UGC service URI>][#compression_method]
+#
+#    example (content in square brackets not mandatory):
+#|       repository = sabayonlinux.org|Sabayon Linux Official Repository|http://pkg.sabayon.org|http://pkg.sabayon.org[,sabayon.org][#bz2]
+#
+# Supported protocols are: file, http, https, ftp, ftps, rsync
+# Remove the initial "|" char, do not uncomment blindly,
+# these are JUST EXAMPLES !!
+
+# Sabayon Linux Official Repository
+# Base source URLs, do not remove
+repository = sabayonlinux.org|Sabayon Linux Official Repository|http://pkg.sabayon.org|http://pkg.sabayon.org,sabayon.org
+
+# id-REPO, Indonesian FOSS Repository, 100Mbit/sec
+repository = sabayonlinux.org||http://bali.idrepo.or.id/sabayon/entropy|
+repository = sabayonlinux.org||http://madura.idrepo.or.id/sabayon/entropy|
+repository = sabayonlinux.org||http://sumbawa.idrepo.or.id/sabayon/entropy|
+
+# RIKEN Nishina Center for research support, Japan, 1Gbit/sec
+repository = sabayonlinux.org||http://riksun.riken.go.jp/pub/pub/Linux/sabayon/entropy|
+# Yamagata University, Japan, 1Gbit/sec
+repository = sabayonlinux.org||http://ftp.yz.yamagata-u.ac.jp/pub/linux/sabayonlinux/entropy|
+# KDDI R&D Laboratories Inc., Japan, 200Mbit/sec
+repository = sabayonlinux.org||http://ftp.kddilabs.jp/Linux/packages/sabayonlinux/entropy|
+
+# Silicon Hill (http://www.sh.cvut.cz), 1Gbit/sec, Czech Republic
+repository = sabayonlinux.org||http://ftp.sh.cvut.cz/MIRRORS/sabayon/entropy|
+# UPC Česká republika, a.s., 2Gbit/sec, Czech Republic
+repository = sabayonlinux.org||http://debian.mirror.dkm.cz/sabayon/entropy|
+
+# KLID, Denmark, 1Gbit/sec
+repository = sabayonlinux.org||ftp://ftp.klid.dk/sabayonlinux/entropy|
+
+# Free Software Network, Hungary, 1Gbit/sec
+repository = sabayonlinux.org||http://ftp.fsn.hu/pub/linux/distributions/sabayon/entropy|
+repository = sabayonlinux.org||rsync://ftp.fsn.hu/linux/sabayon/entropy|
+repository = sabayonlinux.org||ftp://ftp.fsn.hu/pub/linux/distributions/sabayon/entropy|
+
+# University of Crete, 1Gbit/sec, Greece
+repository = sabayonlinux.org||http://ftp.cc.uoc.gr/mirrors/linux/SabayonLinux/entropy|
+
+# Rede das Novas Licenciaturas - Instituto Superior Técnico, 1Gbit/sec, Portugal
+repository = sabayonlinux.org||http://ftp.rnl.ist.utl.pt/pub/sabayon/entropy|
+repository = sabayonlinux.org||ftp://ftp.rnl.ist.utl.pt/pub/sabayon/entropy|
+
+# Freelydifferent.com, France
+repository = sabayonlinux.org||http://mirror.freelydifferent.com/sabayon/entropy|
+
+# NLUUG, Holland
+repository = sabayonlinux.org||ftp://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/entropy|
+repository = sabayonlinux.org||rsync://ftp.nluug.nl/sabayonlinux/entropy|
+# Surfnet, Holland
+repository = sabayonlinux.org||http://ftp.surfnet.nl/pub/os/Linux/distr/sabayonlinux/entropy|
+repository = sabayonlinux.org||rsync://ftp.SURFnet.nl/sabayonlinux/entropy|
+
+# Yes Optus Mirror, Australia
+# repository = sabayonlinux.org||http://mirror.optusnet.com.au/sabayon/entropy|
+# repository = sabayonlinux.org||ftp://mirror.optusnet.com.au/sabayon/entropy|
+
+# AArnet.edu/Internode, Australia
+repository = sabayonlinux.org||http://mirror.internode.on.net/pub/sabayonlinux/entropy|
+repository = sabayonlinux.org||ftp://mirror.aarnet.edu.au/pub/SabayonLinux/entropy|
+repository = sabayonlinux.org||rsync://mirror.aarnet.edu.au/sabayonlinux/entropy|
+
+# Instituto Federal de Educação, Ciência e Tecnologia do Cearà, Brazil
+repository = sabayonlinux.org||http://www2.itti.ifce.edu.br/sabayon/entropy|
+
+# Universidade Federal do Parana', Brazil
+repository = sabayonlinux.org||http://sabayon.c3sl.ufpr.br/entropy|
+repository = sabayonlinux.org||ftp://sabayon.c3sl.ufpr.br/sabayon/entropy|
+repository = sabayonlinux.org||rsync://sabayon.c3sl.ufpr.br/sabayon/entropy|
+
+# University of Maryland LUG, 1Gbit/sec, United States
+repository = sabayonlinux.org||http://mirror.umd.edu/sabayonlinux/entropy|
+repository = sabayonlinux.org||rsync://mirror.umd.edu/sabayonlinux/entropy|
+# Open Source Institute, Clarkson University, 300Mbit/sec, United States
+repository = sabayonlinux.org||http://mirror.clarkson.edu/sabayon/entropy|
+# Cross-LFS Project mirror, United States
+repository = sabayonlinux.org||http://cross-lfs.sabayonlinux.org/entropy|
+
+# GARR Network mirror, Italy
+repository = sabayonlinux.org||http://na.mirror.garr.it/mirrors/sabayonlinux/entropy|
+
diff --git a/conf/repositories.conf.example b/conf/repositories.conf.example
index 910c126dc..9edb37cdd 100644
--- a/conf/repositories.conf.example
+++ b/conf/repositories.conf.example
@@ -1,74 +1,5 @@
 # Project Entropy 1.0 repositories configuration file
 
-#
-#  syntax for repositories (content in square brackets not mandatory):
-#
-#    repository: where the available packages and its database are stored
-#|    repository = repository_id|repository description|<packages mirror 1> <packages mirror 2> <...>|<database uri>[,<UGC service URI>][#compression_method][#<service port,ssl service port>]
-#
-#    example (content in square brackets not mandatory):
-#|       repository = sabayonlinux.org|Sabayon Linux Official Repository|http://pkg.sabayon.org|http://pkg.sabayon.org[,sabayon.org][#bz2][#1026,1027]
-#
-# NOTE: supported protocols are: file, http, https, ftp, ftps, rsync
-# NOTE2: remove the initial "|" char, do not uncomment blindly, these are JUST EXAMPLE !!
-
-# Sabayon Linux Official Repository
-repository = sabayonlinux.org|Sabayon Linux Official Repository|http://pkg.sabayon.org|http://pkg.sabayon.org,sabayon.org
-
-# Misc, unsorted mirrors (TODO, sort them)
-repository = sabayonlinux.org||http://mirror.agooga.ru/Linux/sabayonlinux/entropy|
-repository = sabayonlinux.org||http://bali.idrepo.or.id/sabayon/entropy|
-repository = sabayonlinux.org||http://madura.idrepo.or.id/sabayon/entropy|
-repository = sabayonlinux.org||http://sumbawa.idrepo.or.id/sabayon/entropy|
-repository = sabayonlinux.org||http://riksun.riken.go.jp/pub/pub/Linux/sabayon/entropy|
-repository = sabayonlinux.org||http://ftp.sh.cvut.cz/MIRRORS/sabayon/entropy|
-repository = sabayonlinux.org||http://ftp2.cz.freebsd.org/pub/sabayon/entropy|
-repository = sabayonlinux.org||http://debian.mirror.dkm.cz/sabayon/entropy|
-repository = sabayonlinux.org||http://mirror.umd.edu/sabayonlinux/entropy rsync://mirror.umd.edu/sabayonlinux/entropy|
-repository = sabayonlinux.org||ftp://ftp.klid.dk/sabayonlinux/entropy|
-repository = sabayonlinux.org||http://ftp.fsn.hu/pub/linux/distributions/sabayon/entropy rsync://ftp.fsn.hu/linux/sabayon/entropy|
-repository = sabayonlinux.org||ftp://ftp.fsn.hu/pub/linux/distributions/sabayon/entropy|
-repository = sabayonlinux.org||http://mirrors.cs.wmich.edu/sabayon/entropy|
-repository = sabayonlinux.org||http://ftp.cc.uoc.gr/mirrors/linux/SabayonLinux/entropy|
-repository = sabayonlinux.org||http://mirror.dun.nu/sabayonlinux/entropy|
-repository = sabayonlinux.org||http://ftp.rnl.ist.utl.pt/pub/sabayon ftp://ftp.rnl.ist.utl.pt/pub/sabayon|
-
-# Freelydifferent.com, France
-repository = sabayonlinux.org||http://mirror.freelydifferent.com/sabayon/entropy|
-
-# Open Source Institute, Clarkson University, United States
-repository = sabayonlinux.org||http://mirror.clarkson.edu/sabayon/entropy|
-
-# NLUUG, Holland
-repository = sabayonlinux.org||ftp://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/entropy rsync://ftp.nluug.nl/sabayonlinux/entropy|
-# Surfnet, Holland
-repository = sabayonlinux.org||http://ftp.surfnet.nl/pub/os/Linux/distr/sabayonlinux/entropy rsync://ftp.SURFnet.nl/sabayonlinux/entropy|
-# AArnet.edu/Internode, Australia
-repository = sabayonlinux.org||http://mirror.internode.on.net/pub/sabayonlinux/entropy ftp://mirror.aarnet.edu.au/pub/SabayonLinux/entropy rsync://mirror.aarnet.edu.au/sabayonlinux/entropy|
-# Instituto Federal de Educação, Ciência e Tecnologia do Cearà, Brazil
-repository = sabayonlinux.org||http://www2.itti.ifce.edu.br/sabayon/entropy|
-# Universidade Federal do Parana', Brazil
-repository = sabayonlinux.org||http://sabayon.c3sl.ufpr.br/entropy ftp://sabayon.c3sl.ufpr.br/sabayon/entropy rsync://sabayon.c3sl.ufpr.br/sabayon/entropy|
-# Cross-LFS Project mirror, United States
-repository = sabayonlinux.org||http://cross-lfs.sabayonlinux.org/entropy|
-# GARR Network mirror, Italy
-repository = sabayonlinux.org||http://na.mirror.garr.it/mirrors/sabayonlinux/entropy|
-# Yes Optus Mirror, Australia
-# repository = sabayonlinux.org||http://mirror.optusnet.com.au/sabayon/entropy ftp://mirror.optusnet.com.au/sabayon/entropy|
-
-# Experimental Sabayon repository "sabayon-limbo"
-# Here you can find in-testing packages that will be merged to
-# the mainline repository soon.
-# You can use any mirror listed for "sabayonlinux.org"
-# repository = sabayon-limbo|Sabayon Limbo Testing Repository|http://cerberus.itti.ifce.edu.br/entropy|http://pkg.sabayon.org,sabayon.org
-# repository = sabayon-limbo||http://ftp.nluug.nl/pub/os/Linux/distr/sabayonlinux/entropy|
-# repository = sabayon-limbo||http://ftp.rnl.ist.utl.pt/pub/sabayon ftp://ftp.rnl.ist.utl.pt/pub/sabayon|
-# repository = sabayon-limbo||http://mirror.internode.on.net/pub/sabayonlinux/entropy|
-# repository = sabayon-limbo||ftp://mirror.aarnet.edu.au/pub/SabayonLinux/entropy|
-# repository = sabayon-limbo||http://cross-lfs.sabayonlinux.org/entropy|
-# repository = sabayon-limbo||http://na.mirror.garr.it/mirrors/sabayonlinux/entropy|
-
-
 # syntax for differential-update
 # differential-update: This setting controls the way Entropy client updates
 #                      its repositories. If you're on a slow/unstable network