diff --git a/automaint b/automaint
index 9321a19..6cc9d0f 100755
--- a/automaint
+++ b/automaint
@@ -1,13 +1,11 @@
 #!/bin/bash
 # automaint -- batch automatic maintainance tool of the autodist suite
-# Copyright (C) 2013-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2013-2020 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
 VERSION=0.9.7
 # First in vector is base arch
-ARCHS=(i586 arm x86_64)
-
 . /etc/autodist/config
 
 me=(${0##*/} $VERSION "Sat Mar 20 2011")
@@ -152,8 +150,8 @@ done
 
 [ "$TESTMODE" ] && echo "** TEST MODE enabled: no changes will be made **"
 
-for a in `seq 1 ${#ARCHS[*]}`; do
-   . $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY/builds-${ARCHS[$a-1]}.sh
+for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do
+   . $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY/builds-${AUTODIST_ARCHS[$a-1]}.sh
    pkglist[$a-1]="${pkg_list[*]}"
    warningslist[$a-1]="${warnings_list[*]}"
    needportlist[$a-1]="${needport_list[*]}"
@@ -164,7 +162,7 @@ tmpfile=`mktemp -q -t $me.XXXXXXXX` || {
       exit 1
    }
 
-for a in `seq 1 ${#ARCHS[*]}`; do
+for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do
    echo -n "${pkglist[$a-1]} " >> $tmpfile
 done
 allpkgs="`cat $tmpfile | xargs -n 1 | sort -u | xargs`"
@@ -179,10 +177,10 @@ for p in ${allpkgs}; do
    done
    [ "$pkgcontinue" ] && continue
 
-   for a in `seq 1 ${#ARCHS[*]}`; do
-      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$PORT_REPOSITORY ${ARCHS[$a-1]} $p
+   for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do
+      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$PORT_REPOSITORY ${AUTODIST_ARCHS[$a-1]} $p
       if [ ! "$pkg_name" ]; then
-         get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${ARCHS[$a-1]} $p
+         get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${AUTODIST_ARCHS[$a-1]} $p
       fi
 
       if [ "$pkg_name" ]; then
@@ -204,8 +202,8 @@ for p in ${allpkgs}; do
    done
    [ "$needsport" -a ! "$PORT_REPOSITORY" ] && continue
 
-   for a in `seq 1 ${#ARCHS[*]}`; do
-      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY ${ARCHS[$a-1]} $p
+   for a in `seq 1 ${#AUTODIST_ARCHS[*]}`; do
+      get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$SOURCE_REPOSITORY ${AUTODIST_ARCHS[$a-1]} $p
       [ "$pkg_name" ] && break
    done
 
diff --git a/autoport b/autoport
index 0d27905..63951e3 100755
--- a/autoport
+++ b/autoport
@@ -1,6 +1,6 @@
 #!/bin/bash
 # autoport -- batch cross-build tool based on autodist
-# Copyright (C) 2011-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2011-2020 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
diff --git a/etc/autodist/config b/etc/autodist/config
index 091b974..cf61185 100644
--- a/etc/autodist/config
+++ b/etc/autodist/config
@@ -1,6 +1,6 @@
 # Global configuration file for autodist
 #
-AUTODIST_ARCHS=(i586 x86_64 arm)
+AUTODIST_ARCHS=(i586 x86_64 arm aarch64)
 SITE_BASE_URL=http://www.openmamba.org
 REPS_BASE_URL=${SITE_BASE_URL}/pub/openmamba
 LOCAL_REPS_BASE_DIR=/var/ftp/pub/openmamba