diff --git a/fetch-backup-work b/fetch-backup-work
index 98623cfcd66a894fa324c1355f3ee9625618e172..23190836f85d6b72fb53cd01e783574678d334e1 100755
--- a/fetch-backup-work
+++ b/fetch-backup-work
@@ -27,7 +27,7 @@ ssh uhumhummy ls -1 /lysator/lyswww/users/roxen_only \
  | awk '{print "roxen", $1, "uhumhummy /lysator/lyswww/users/roxen_only/" $1}'\
 >> $NT
 
-ssh nema.lysator.liu.se ypcat -k auto_home \
+ssh koeberg.lysator.liu.se ypcat -k auto_home \
  | sort \
  | grep -v DELETE \
  | grep -v '^ *$' \
@@ -59,7 +59,7 @@ ssh nema.lysator.liu.se ypcat -k auto_home \
  | sed 's/^/home /' \
 >> $NT
 
-ssh nema.lysator.liu.se 'cd /home/quota1 && ls -1 | while read d ; do [ -d "$d" ] && [ ! -L "$d" ] && echo "$d" ; done' \
+ssh koeberg.lysator.liu.se 'cd /home/quota1 && ls -1 | while read d ; do [ -d "$d" ] && [ ! -L "$d" ] && echo "$d" ; done' \
 | awk '{ print "quota1", $1, "home", "/export/users/quota1/" $1 }' \
 | sort >> $NT
 
@@ -92,6 +92,7 @@ echo lenin var-spool-postfix lenin /var/spool/postfix >> $NT
 echo lenin var-lib-mailman lenin /var/lib/mailman >> $NT
 
 ssh lenin 'cd /home && ls -1 | while read d ; do [ -d "$d" ] && [ ! -L "$d" ] && echo "$d" ; done' \
+| grep -v DELETE \
 | awk '{ print "mail", $1, "lenin", "/home/" $1 }' \
 | sort >> $NT
 
@@ -107,7 +108,22 @@ echo shafan boot shafan /boot >> $NT
 echo vesuvius root vesuvius / >> $NT
 echo vesuvius boot vesuvius /boot >> $NT
 
-diff -u $TASKS $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/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
+
+sort $TASKS > $TASKS.sorted
+sort $NT > $NT.sorted
+diff -u $TASKS.sorted $NT.sorted | grep -v ^@ | grep -v '^ '
 echo -n '[CONFIRM] '
 read line
 mv -f $NT $TASKS