diff --git a/fetch-backup-work b/fetch-backup-work
index 47af8cb44fa2ff81336226206eca561a227b3a2c..47c60f3813fdc44411e9f78c8381e6e71fc6aeaf 100755
--- a/fetch-backup-work
+++ b/fetch-backup-work
@@ -66,10 +66,10 @@ ssh stalhein.lysator.liu.se 'cd /home/quota1 && ls -1 | while read d ; do [ -d "
 echo lyskom kom compulsion /export/mdsk2/sw_lyskom_compulsion \
 >> $NT
 
-echo sedesopim var sedesopim /var >> $NT
-echo sedesopim home sedesopim /home >> $NT
-echo sedesopim root sedesopim / >> $NT
-echo sedesopim boot sedesopim /boot >> $NT
+echo perlis etc perlis /etc >> $NT
+echo perlis var perlis /var >> $NT
+echo perlis home perlis /home >> $NT
+echo perlis root perlis / >> $NT
 
 echo poseidon var poseidon /var >> $NT
 echo poseidon root poseidon /root >> $NT
@@ -78,9 +78,11 @@ ssh poseidon 'cd /var/repositories && ls -1 | while read d ; do [ -d "$d" ] && [
 | awk '{ print "lyssvn", $1, "poseidon", "/var/repositories/" $1 }' \
 | sort >> $NT
 
-echo hanna root hanna / >> $NT
-ssh hanna 'cd /export/hanna/ftp/pub && ls -1 | while read d ; do [ -d "$d" ] && [ ! -L "$d" ] && echo "$d" ; done' \
-| awk '{ print "ftp-pub", $1, "hanna", "/export/hanna/ftp/pub/" $1 }' \
+echo kelvin root kelvin / >> $NT
+echo kelvin var kelvin /var >> $NT
+ssh ftp 'bash -c "cd /export/ftp/pub && ls -1 | while read d ; do [ -d "\$d" ] && [ ! -L "\$d" ] && echo "\$d" ; done"' \
+| awk '$1 == "FreeBSD" { next }
+       { print "ftp-pub", $1, "ftp", "/export/ftp/pub/" $1 }' \
 | sort >> $NT
 
 echo medreg sqldump wrath /var/lib/mysql-dump >> $NT
@@ -100,21 +102,21 @@ echo shafan root shafan / >> $NT
 echo shafan boot shafan /boot >> $NT
 
 # ejabberd
-echo vesuvius root vesuvius / >> $NT
-echo vesuvius boot vesuvius /boot >> $NT
+echo dijkstra root dijkstra / >> $NT
+echo dijkstra boot dijkstra /boot >> $NT
 
 # eureka
 echo eureka etc eureka /etc >> $NT
 echo eureka admin eureka /pikedata/eureka-admin
 
-ssh eureka 'cd /pikedata/homes && /bin/ls -1d */* | sed "s%/% %" | while read zone user; do [ -d "$zone/$user" ] && [ ! -L "$zone" ] && [ ! -L "$zone/$user" ] && echo eureka-home $zone--$user eureka /pikedata/homes/$zone/$user ; done ' \
-| sort >> $NT
+#ssh eureka 'cd /pikedata/homes && /bin/ls -1d */* | sed "s%/% %" | while read zone user; do [ -d "$zone/$user" ] && [ ! -L "$zone" ] && [ ! -L "$zone/$user" ] && echo eureka-home $zone--$user eureka /pikedata/homes/$zone/$user ; done ' \
+#| sort >> $NT
 
-ssh eureka 'cd /pikedata/repositories && /bin/ls -1d */* | sed "s%/% %" | while read vcs proj; do [ -d "$vcs/$proj" ] && [ ! -L "$vcs" ] && [ ! -L "$vcs/$proj" ] && echo eureka-repo $vcs--$proj eureka /pikedata/repositories/$vcs/$proj ; done ' \
-| sort >> $NT
+#ssh eureka 'cd /pikedata/repositories && /bin/ls -1d */* | sed "s%/% %" | while read vcs proj; do [ -d "$vcs/$proj" ] && [ ! -L "$vcs" ] && [ ! -L "$vcs/$proj" ] && echo eureka-repo $vcs--$proj eureka /pikedata/repositories/$vcs/$proj ; done ' \
+#| sort >> $NT
 
-ssh eureka 'cd /pikedata/zones && /bin/ls -1d * | while read zone ; do [ -d "$zone" ] && [ ! -L "$zone" ] && echo eureka-etc $zone eureka /pikedata/zones/$zone/root/etc; done' \
-| sort >> $NT
+#ssh eureka 'cd /pikedata/zones && /bin/ls -1d * | while read zone ; do [ -d "$zone" ] && [ ! -L "$zone" ] && echo eureka-etc $zone eureka /pikedata/zones/$zone/root/etc; done' \
+#| sort >> $NT
 
 sort $TASKS > $TASKS.sorted
 sort $NT > $NT.sorted