diff --git a/autodist-cgi b/autodist-cgi
index 3c92e13..ec6bb2b 100755
--- a/autodist-cgi
+++ b/autodist-cgi
@@ -87,22 +87,34 @@ for i in `seq 0 ${#AUTOPORT_ARCH[*]}`; do
       LOGFILE="/var/autodist/log/autodist.log"
       LASTLOGFILE="/var/autodist/log/autodist-last.log"
    elif [ "${AUTOPORT_CHROOT[$i]}" ]; then
-      LOGFILE="/var/autodist/log/autoport-chroot-${AUTOPORT_CHROOT[$i]}.log"
-      LASTLOGFILE="/var/autodist/log/autoport-chroot-${AUTOPORT_CHROOT[$i]}-last.log"
-      AUTODISTLOGFILE="/var/autoport/${AUTOPORT_CHROOT[$i]}/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/$r.log"
+      LOGFILE="/var/autodist/log/autoport-chroot-$r-${AUTOPORT_CHROOT[$i]}.log"
+      LASTLOGFILE="/var/autodist/log/autoport-chroot-$r-${AUTOPORT_CHROOT[$i]}-last.log"
+      AUTODISTLOGFILE="/var/autoport/${AUTOPORT_CHROOT[$i]}/home/${AUTOPORT_CHROOT_USER[$i]}/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log"
    elif [ "${AUTOPORT_NATIVE[$i]}" ]; then
       LOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}.log"
       LASTLOGFILE="/var/autodist/log/autoport-native-$r-${AUTOPORT_ARCH[$i]}-last.log"
-      AUTODISTLOGFILE="/var/autodist/.autoport/${AUTOPORT_ARCH[$i]}/$r.log"
+      AUTODISTLOGFILE="/var/autodist/.autoport/${AUTOPORT_ARCH[$i]}/$r-current.log"
    elif [ "${AUTOPORT_CROSS[$i]}" ]; then
-      LOGFILE="/var/autodist/log/autoport-cross-${AUTOPORT_CROSS[$i]}.log"
-      LASTLOGFILE="/var/autodist/log/autoport-cross-${AUTOPORT_CROSS[$i]}-last.log"
+      LOGFILE="/var/autodist/log/autoport-cross-$r-${AUTOPORT_CROSS[$i]}.log"
+      LASTLOGFILE="/var/autodist/log/autoport-cross-$r-${AUTOPORT_CROSS[$i]}-last.log"
    else
       continue
    fi
    if [ "$SHOWLOG" ]; then
       if [ "$HOST" = "$AS_HOST" -a "$NUM" = "$i" ]; then
-         echo "<h2>$SHOWLOG log in $r(${AUTOPORT_ARCH[$i]}):</h2>"
+         echo -n "<h2>$SHOWLOG log in "
+         if [ "${AUTOPORT_UPDATE[$i]}" ]; then
+            echo -n "update"
+         elif [ "${AUTOPORT_CHROOT[$i]}" ]; then
+            echo -n "${AUTOPORT_CHROOT[i]} chroot"
+         elif [ "${AUTOPORT_NATIVE[$i]}" ]; then
+            echo -n "native"
+         elif [ "${AUTOPORT_CROSS[$i]}" ]; then
+             echo -n "cross"
+         fi
+         echo " environment for ${AUTOPORT_ARCH[$i]}"
+         [ "${SHOWLOG}" = "current" -o "${SHOWLOG}" = "last" -a ! "${AUTOPORT_UPDATE[$i]}" ] && echo -n " ($r)"
+         echo -n ":</h2>"
          cat << _EOF
 <div class=downloadbox align=center>
 <div align=left style="background-color: white; height: 550px; width: 850px; overflow: auto; font-size: 8pt; border:1px solid #2b6600; margin: 4px; padding:4; background-color: #e0f2d0;">
@@ -136,7 +148,9 @@ _EOF
             [ -e ${BUILDLOGDIR}${SHOWLOG} ] && cat ${BUILDLOGDIR}${SHOWLOG} | sed "s|<|\&lt;|g"
          fi
          echo "</code></pre></div></div>"
+         break
       fi
+      [ "${AUTOPORT_UPDATE[$i]}" ] && break
    elif [ ! "$SHOWLOG" ]; then
       RELOADTIME=60000
       [[ "$NUM" && "$NUM" != "$i" ]] && continue