diff --git a/eth/mailinglist_mapping.sh b/eth/mailinglist_mapping.sh
index 4fcfb10..a79738f 100755
--- a/eth/mailinglist_mapping.sh
+++ b/eth/mailinglist_mapping.sh
@@ -42,6 +42,7 @@ while [ $i -lt 4 ]; do
    eval prof=\$prof_$i
    eval ml=\$ml_$i
    allprofs="$prof $allprofs"
+   allmls="$ml $allmls"
 
    for class in $classes; do
       echo "# Create (automatic) mailinglist: ${ml}-${class}"
@@ -53,6 +54,6 @@ while [ $i -lt 4 ]; do
 done
 
 for class in $allclasses; do
-   echo "# Create umbrella list systems-$class containing {${allprofs}}-$class"
+   echo "# Create umbrella list systems-$class containing {${allmls}}-$class"
 done
 echo "# Create umbrella list systems-all containing {systems-{$allclasses}"
diff --git a/get-sysinfo.sh b/get-sysinfo.sh
index 72e35b9..727619b 100755
--- a/get-sysinfo.sh
+++ b/get-sysinfo.sh
@@ -22,7 +22,11 @@
 
 
 host="$(hostname)"
-dest="${0%%*/}.${host}.log"
+dest="${0##*/}.${host}.log"
+prog="| tee ${dest}"
+
+# output to stdout
+[ "$1" = "-" ] && prog=""
 
 (
    # log, what produced the output
@@ -48,4 +52,4 @@ dest="${0%%*/}.${host}.log"
    mount
    df -h
 
-) 2>&1 | tee "${dest}"
+) 2>&1 ${prog}