diff --git a/gestion/annuaires.py b/gestion/annuaires.py
index b2325f9c..da1776cc 100644
--- a/gestion/annuaires.py
+++ b/gestion/annuaires.py
@@ -150,65 +150,14 @@ chbre_prises={ 'a' :
 '011': '011', '012': '012', '091': '013', '092': '014', '093': '015',
 '094': '016', '095': '017', '096': '018', '097': '019', '999': '020',
 
-'101': '601', '102': '603', '103': '605', '104': '607', '105': '609',
-'106': '611', '107': '613', '108': '615', '109': '617', '110': '619',
-'111': '621', '112': '623', '113': '625', '114': '627', '115': '629',
-'116': '631', '117': '633', '118': '635', '119': '637', '120': '639',
-'121': '641', '122': '643', '123': '645', '124': '647', '125': '602',
-'126': '604', '127': '606', '128': '608', '129': '610', '130': '612',
-'131': '614', '132': '616', '133': '618', '134': '620', '135': '622',
-'136': '624', '137': '626', '138': '628', '139': '630', '140': '632',
-'141': '634', '142': '636', '143': '638', '144': '640', '145': '642',
-'146': '644', '147': '646', '148': '648', '149': '707', '150': '709',
-'151': '711',
+'449': '301', '450': '302', '451': '303',
+'549': '304', '550': '305', '551': '306',
 
-'201': '501', '202': '503', '203': '505', '204': '507', '205': '509',
-'206': '511', '207': '513', '208': '515', '209': '517', '210': '519',
-'211': '521', '212': '523', '213': '525', '214': '527', '215': '529',
-'216': '531', '217': '533', '218': '535', '219': '537', '220': '539',
-'221': '541', '222': '543', '223': '545', '224': '547', '225': '502',
-'226': '504', '227': '506', '228': '508', '229': '510', '230': '512',
-'231': '514', '232': '516', '233': '518', '234': '520', '235': '522',
-'236': '524', '237': '526', '238': '528', '239': '530', '240': '532',
-'241': '534', '242': '536', '243': '538', '244': '540', '245': '542',
-'246': '544', '247': '546', '248': '548', '249': '713', '250': '715',
-'251': '717',
+'149': '716', '150': '717', '151': '718',
+'249': '719', '250': '720', '251': '721',
+'349': '722', '350': '723', '351': '724',
 
-'301': '401', '302': '403', '303': '405', '304': '407', '305': '409',
-'306': '411', '307': '413', '308': '415', '309': '417', '310': '419',
-'311': '421', '312': '423', '313': '425', '314': '427', '315': '429',
-'316': '431', '317': '433', '318': '435', '319': '437', '320': '439',
-'321': '441', '322': '443', '323': '445', '324': '447', '325': '402',
-'326': '404', '327': '406', '328': '408', '329': '410', '330': '412',
-'331': '414', '332': '416', '333': '418', '334': '420', '335': '422',
-'336': '424', '337': '426', '338': '428', '339': '430', '340': '432',
-'341': '434', '342': '436', '343': '438', '344': '440', '345': '442',
-'346': '444', '347': '446', '348': '448', '349': '719', '350': '721',
-'351': '723',
-
-'401': '201', '402': '202', '403': '203', '404': '204', '405': '205',
-'406': '206', '407': '207', '408': '208', '409': '209', '410': '210',
-'411': '211', '412': '212', '413': '213', '414': '214', '415': '215',
-'416': '216', '417': '217', '418': '218', '419': '219', '420': '220',
-'421': '221', '422': '222', '423': '223', '424': '224', '425': '225',
-'426': '226', '427': '227', '428': '228', '429': '229', '430': '230',
-'431': '231', '432': '232', '433': '233', '434': '234', '435': '235',
-'436': '236', '437': '237', '438': '238', '439': '239', '440': '240',
-'441': '241', '442': '242', '443': '243', '444': '244', '445': '245',
-'446': '246', '447': '247', '448': '248', '449': '301', '450': '302',
-'451': '303',
-
-'501': '101', '502': '102', '503': '103', '504': '104', '505': '105',
-'506': '106', '507': '107', '508': '108', '509': '109', '510': '110',
-'511': '111', '512': '112', '513': '113', '514': '114', '515': '115',
-'516': '116', '517': '117', '518': '118', '519': '119', '520': '120',
-'521': '121', '522': '122', '523': '123', '524': '124', '525': '125',
-'526': '126', '527': '127', '528': '128', '529': '129', '530': '130',
-'531': '131', '532': '132', '533': '133', '534': '134', '535': '135',
-'536': '136', '537': '137', '538': '138', '539': '139', '540': '140',
-'541': '141', '542': '142', '543': '143', '544': '144', '545': '145',
-'546': '146', '547': '147', '548': '148', '549': '304', '550': '305',
-'551': '306'
+# la suite en bas...
 },
 
 'h' :
@@ -461,6 +410,10 @@ chbre_prises={ 'a' :
  '999':'701' , '998':'702' , '997':'703' , '996':'704'}
 }
 
+for etage, switch in [(1,6), (2,5), (3,4), (4,2), (5,1)]:
+    for i in range(1,49):
+        chbre_prises['g']['%s%s' % (etage, i)] = '%s%s' % (switch, i)
+
 # Prises d'uplink, de machines du crans / Prises d'utilité CRANS
 uplink_prises={ 'a' :
 { 49 : 'uplink->backbone', 50 : 'uplink->bata-1',