-@def $jcristau = ($jcristau 82.225.74.107/32); # home
-@def $jcristau = ($jcristau 109.190.107.82/32); # office
-@def $master = (82.195.75.110); # master.debian.org
-@def $DSA_IPS = ($sgran $weasel $zobel $luca $paravoid $tfheen $jcristau $master);
-
-@def $sgran6 = (2001:4b10:100b::/48);
-@def $sgran6 = ($sgran6 2001:4b10:0000:810b::/64);
-@def $weasel6 = ();
-@def $weasel6 = ($weasel6 2001:826:408::/48); # unisbg
-@def $weasel6 = ($weasel6 2001:858:10f::/48); # anguilla
-@def $zobel6 = ();
-@def $zobel6 = ($zobel6 2001:6f8:1215::/48); # baldur
-@def $zobel6 = ($zobel6 2001:6f8:928::/48); # WS2
-@def $zobel6 = ($zobel6 2a01:198:549::/48); # WGS20
-@def $zobel6 = ($zobel6 2a01:198:6b2::/48); # AdS20
-@def $zobel6 = ($zobel6 2a02:158::/32); # DG-i AS
-@def $luca6 = ();
-@def $paravoid6 = (2001:648:2ffc:113:dcdb:eeff:fe5c:182b); # scrooge.tty.gr
-@def $tfheen6 = ();
-@def $tfheen6 = ($tfheen6 2a02:c0:1013:1::/64); # Office
-@def $tfheen6 = ($tfheen6 2001:840:f000:4007::/64); # Home, link
-@def $tfheen6 = ($tfheen6 2001:840:4007::/48); # Home
-@def $jcristau6 = (2a01:e35:2e14:a6b0::/64); # home
-@def $master6 = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $jcristau6 $master6);
-
-@def $USER_christoph = ();
-#@def $USER_christoph = ($USER_christoph 212.114.250.148/31);
-#@def $USER_christoph = ($USER_christoph 128.111.48.6/32); # U of Cal at Santa Barbara, until 2013-03
-@def $USER_aurel32 = ();
-@def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net
-@def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net
-@def $USER_joerg = ();
-@def $USER_joerg = ($USER_joerg 213.146.108.160/29);
-@def $USER_joerg = ($USER_joerg 46.4.205.32);
-@def $USER_joerg6 = ();
-@def $USER_joerg6 = ($USER_joerg6 2a02:248:1005::/48);
-@def $USER_joerg6 = ($USER_joerg6 2a01:4f8:131:1520::6667);
-
-@def $BUILDD_SSH_ACCESS = ();
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.18); # wuiet
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 206.12.19.5); # ravel
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 82.195.75.110); # new-master
-@def $FREEBSD_SSH_ACCESS = ();
-@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS);
-@def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $USER_christoph $USER_aurel32); # buildd admins
+@def $jcristau = ($jcristau 82.255.47.115/32); # home
+@def $jcristau = ($jcristau 62.210.122.202/32); # topinambour
+@def $jcristau = ($jcristau 2a01:e35:2ff2:f730::/61); # home
+@def $jcristau = ($jcristau 2001:bc8:3f1d::/48); # topinambour
+
+@def $master = (82.195.75.110 2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
+@def $people = (5.153.231.30 2001:41c8:1000:21::21:30); # paradis.debian.org
+@def $draghi = (82.195.75.106 2001:41b8:202:deb:1a1a:0:52c3:4b6a); # draghi.debian.org
+
+@def $DSA_IPS = ($weasel $zobel $luca $tfheen $jcristau $master $people $draghi);