-@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 $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 $master6 = (2001:41b8:202:deb:216:36ff:fe40:4001); # master.debian.org
+@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6 $paravoid6 $tfheen6 $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