diff --git a/Python/etc/munin/munin-test.conf b/Python/etc/munin/munin-test.conf
index fdf725e..6e38083 100755
--- a/Python/etc/munin/munin-test.conf
+++ b/Python/etc/munin/munin-test.conf
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 # This is work in progress, please do not commit
 # -- 
 # Daniel STAN
@@ -6,6 +7,8 @@
 # List: print metadata.query.names_by_groups(['mail-mx-main'])
 #print metadata.query.names_by_groups(['mail-mx-main'])
 
+import annuaires_pg
+
 print """
 # The next three variables specifies where the location of the RRD
 # databases, the HTML output, and the logs, severally.  They all
@@ -31,7 +34,7 @@ cgiurl_graph /cgi-bin/munin-cgi-graph
 #==============================  Les switchs  ================================
 #Il ne s'agit pas de clients bcfg2 et ne sont par ailleurs pas des nœuds munin
 """
-switchs = ['backbone','batb-4'] # Todo: real list
+switchs = [ x.split('.')[0] for x in annuaires_pg.all_switchs() ] + ['backbone']
 for host in switchs:
     print '[switchs.crans.org;%s]' % host
     print '    address localhost\n'
@@ -64,11 +67,11 @@ for host in switchs:
 #@
 #@# Imprimante
 #@[association.crans.org;canon]
-@    address zamok.adm.crans.org
-@    contacts impression
+#@    address zamok.adm.crans.org
+#@    contacts impression
 
 
-@# Listes des serveurs
+print # Listes des serveurs
 for client in metadata.query.all():
     print """[%(profile)s]
     address %(hostname)s