diff --git a/config/20-makedist-autobuild b/config/20-makedist-autobuild
index 18af7a9..5229188 100755
--- a/config/20-makedist-autobuild
+++ b/config/20-makedist-autobuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Makedist automatic build script
-# Copyright (c) 2007-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Usage:
 #
@@ -18,7 +18,7 @@
 
 ME=`basename $0`
 [ "$$" == "`pidof -x $ME`" ] || {
-   echo "Warning: script already running; exiting."
+   echo "Warning: makedist-autobuild script already running; exiting."
    exit 0
 }
 
@@ -153,17 +153,6 @@ LANGUAGE=${DESTLANGUAGE} ARCH=${DESTARCH} FORCE=${MAKEDIST_FORCE} || {
                $DESTNAME --target $DESTTORRENT >/dev/null
       fi
    fi
-   DESTSIZE=`du $DESTIMG -h | gawk '{ print $1 }'`
-   DESTMD5=`cat $DESTMD5 | gawk '{ print $1 }'`
-   DESTBUILDDATE=`stat -c %y $SOURCEIMG`
-
-   cat >> $DESTDIR/$DESTLATESTFILENAME << _EOF
-nameArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTNAME';
-pathArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='/download.html?file=$DESTBASEURL/$DESTPRODUCTNAME/$DESTLANGUAGE/';
-sizeArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTSIZE';
-md5Array['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTMD5';
-builddateArray['$DESTPRODUCTNAME-$RELEASETAG-$DESTLANGUAGE-$DESTARCH']='$DESTBUILDDATE';
-_EOF
 
    return $DIST_CREATED
 }
@@ -255,9 +244,8 @@ _EOF
       esac
       for a in ${MEDIA_ARCHS[$m]}; do
          case $a in
-            i586) archtext="x86 (PC)" ;;
-            arm) archtext="arm" ;;
-            *) archtext="unknown" ;;
+            i586) archtext="x86" ;;
+            *) archtext="$a" ;;
          esac
          DESTNAME=$DESTIMGFILEPREFIX-$PRODNAME-$l-${MEDIUMTAG}.${a}.${MEDIUMSUFFIX}
          if [ "$DIST_CREATED" != "255" ]; then
@@ -266,6 +254,22 @@ _EOF
                echo "do_makedist_and_html: calling do_makedist \"$SOURCEIMGFILEPREFIX-$PRODNAME-$l.${a}.${MEDIUMSUFFIX}\" \"$DESTNAME\" \"${l}\" \"${MEDIUMPLATFORM}\" \"${MEDIUMSUBPLATFORM}\" \"$PRODNAME\" \"${a}\""
             do_makedist "$SOURCEIMGFILEPREFIX-$PRODNAME-$l.${a}.${MEDIUMSUFFIX}" "$DESTNAME" "${l}" "${MEDIUMPLATFORM}" "${MEDIUMSUBPLATFORM}" "$PRODNAME" "${a}"
             DIST_CREATED=$?
+
+            DESTDIR=$DESTBASEDIR/${PRODNAME}/${l}
+            DESTIMG=$DESTDIR/$DESTNAME
+            DESTMD5=$DESTDIR/$DESTNAME.MD5.txt
+            DESTTORRENT=$DESTDIR/$DESTNAME.torrent
+            DESTSIZE=`du $DESTIMG -h | gawk '{ print $1 }'`
+            DESTMD5=`cat $DESTMD5 | gawk '{ print $1 }'`
+            DESTBUILDDATE=`stat -c %y $DESTIMG`
+            cat >> $DESTDIR/$DESTLATESTFILENAME << _EOF
+nameArray['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTNAME';
+pathArray['$PRODNAME-$RELEASETAG-${l}-${a}']='/download.html?file=$DESTBASEURL/$PRODNAME/${l}/';
+sizeArray['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTSIZE';
+md5Array['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTMD5';
+builddateArray['$PRODNAME-$RELEASETAG-${l}-${a}']='$DESTBUILDDATE';
+_EOF
+
          fi
          DIST_DWD="$DIST_DWD<option value=\"/download.html?file=$DESTBASEURL/$PRODNAME/$l/$DESTNAME\">${mediumlang} $fortext $archtext</option>"
 #         DIST_DWD="$DIST_DWD <a href=\"/download.html?file=$DESTBASEURL/$PRODNAME/$l/$DESTNAME\">${l}-${a}</a>"