--- db3/configure
+++ db3/configure
@@ -10,9 +10,9 @@
 # XXX edit CFLAGS= ... out of invocation args ???
 ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`"
 
-CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \
+CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure \
 	--enable-shared --enable-static \
-	--with-uniquename=_rpmdb --srcdir=$db_dist
+	--with-uniquename=_rpmdb --srcdir=$db_dist $ARGS
 
 mv Makefile Makefile.orig
 cat Makefile.orig | sed -e '/^install[:-]/c\
--- installplatform
+++ installplatform
@@ -95,6 +95,12 @@
 	CANONARCH=arm
 	CANONCOLOR=0
 	;;
+    aarch64*)
+	ISANAME=aarchh
+	 ISABITS=64
+	 CANONARCH=aarch64
+	 CANONCOLOR=3
+	 ;;
     alpha*)
 	ISANAME=alpha
 	ISABITS=64
@@ -118,6 +124,11 @@
   PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
   [ -d $PPD ] || mkdir -p $PPD
 
+  if [ "$VENDOR" = suse ] ; then
+	# suse doesn't do colors
+	CANONCOLOR=0
+  fi
+
   cat $PLATFORM \
   | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
 	-e "s,@RPMCANONARCH@,$CANONARCH,g" \