-@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6);
-
-@def $USER_kibi = ();
-@def $USER_kibi = ($USER_kibi 90.80.97.98); # gruyere.kerlabs.com
-@def $USER_kibi = ($USER_kibi 88.164.242.219); # home.ikibiki.org
-@def $USER_kibi = ($USER_kibi 82.244.158.68); # @parents'
-@def $USER_aurel32 = ();
-@def $USER_aurel32 = ($USER_aurel32 88.191.82.174); # hall.aurel32.net
-@def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net
+@def $tfheen6 = ();
+@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 $jcristau6 = ($jcristau6 2001:bc8:3f1d::/48); # topinambour
+@def $master6 = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
+@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $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_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 82.195.75.110); # new-master