diff --git a/buildcore.sh b/buildcore.sh
index eb5da381e..0288929a1 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -371,6 +371,8 @@ if [ "$OSNAME" != "AIX" ]; then
             if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS xCAT-genesis-scripts-x86_64"; fi
             ./makerpm xCAT-genesis-scripts ppc64 "$EMBED"
             if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS xCAT-genesis-scripts-ppc64"; fi
+            ./makerpm xCAT-genesis-scripts aarch64 "$EMBED"
+            if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS xCAT-genesis-scripts-aarch64"; fi
             if [ "$FAILEDRPMS" = "$ORIGFAILEDRPMS" ]; then    # all succeeded
                 rm -f $DESTDIR/xCAT-genesis-scripts*rpm
                 rm -f $SRCDIR/xCAT-genesis-scripts*rpm
@@ -392,7 +394,7 @@ for rpmname in xCAT xCATsn; do
             ./makerpm $rpmname "$EMBED"
             if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi
         else
-            for arch in x86_64 ppc64 ppc64le s390x; do
+            for arch in x86_64 ppc64 ppc64le s390x aarch64; do
                 if [ "$rpmname" = "xCAT-OpenStack" -a "$arch" != "x86_64" ] || [ "$rpmname" = "xCAT-OpenStack-baremetal" -a "$arch" != "x86_64" ] ; then continue; fi         # only bld openstack for x86_64 for now
                 ./makerpm $rpmname $arch "$EMBED"
                 if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname-$arch"; fi
diff --git a/buildlocal.sh b/buildlocal.sh
index 54bd06a86..853471758 100755
--- a/buildlocal.sh
+++ b/buildlocal.sh
@@ -123,7 +123,7 @@ echo "This is an $OSNAME system"
                         $CURDIR/makerpm $rpmname
                         if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi
                 else
-                        for arch in x86_64 ppc64 s390x; do
+                        for arch in x86_64 ppc64 s390x aarch64; do
                                 $CURDIR/makerpm $rpmname $arch
                                 if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname-$arch"; fi
                         done