diff --git a/installplatform b/installplatform
index 9d34c79..e8e66e5 100755
--- a/installplatform
+++ b/installplatform
@@ -33,6 +33,9 @@ case "$arch" in
   i[3456]86|k6|athlon|athlon_xp|pentium[234])
     SUBSTS='s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),i386, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),i486, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),i586, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),i686, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),k6, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),athlon, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),athlon_xp, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),pentium2, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),pentium3, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),pentium4, s,\(i[3456]86\|k6\|athlon_xp\|athlon\|pentium[234]\),noarch,'
     ;;
+  aarch64)
+    SUBSTS='s,aarch64,aarch64, s,aarch64,noarch,'
+    ;;
   alpha*)
     SUBSTS='s,alpha,alpha, s,alpha,alphaev5, s,alpha,alphaev56, s,alpha,alphapca56, s,alpha,alphaev6, s,alpha,alphaev67,'
     ;;
@@ -72,6 +75,7 @@ for SUBST in $SUBSTS ; do
 
   ARCH_INSTALL_POST='%{nil}'
   case "${ARCH}-${OS}" in
+    aarch64-linux) LIB=lib64 ;;
     sparc64-linux) LIB=lib64 ;;
     x86_64-linux) LIB=lib64 ;;
   esac
diff --git a/rpmrc.in b/rpmrc.in
index 5bddac4..882a779 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -66,6 +66,7 @@ optflags: armv6l %optflags_default -fomit-frame-pointer -march=armv6
 optflags: arm %optflags_default -fomit-frame-pointer -march=armv5te
 optflags: armv7l %optflags_default -fomit-frame-pointer -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
 optflags: armh %optflags_default -fomit-frame-pointer -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
+optflags: aarch64 %optflags_default
 
 optflags: atarist %optflags_default -fomit-frame-pointer
 optflags: atariste %optflags_default -fomit-frame-pointer
@@ -152,6 +153,8 @@ arch_canon:	ppc64:	ppc64	16
 arch_canon:	sh: sh		17
 arch_canon:	xtensa: xtensa	18
 
+arch_canon:	aarch64: aarch64	19
+
 #############################################################
 # Canonical OS names and numbers
 
@@ -304,6 +307,7 @@ arch_compat: armv3l: noarch
 arch_compat: armv5b: armv4b
 arch_compat: armv4b: armeb
 arch_compat: armeb: noarch
+arch_compat: aarch64: noarch
 
 arch_compat: atarist: m68kmint noarch
 arch_compat: atariste: m68kmint noarch
@@ -406,6 +410,7 @@ buildarch_compat: armv3l: noarch
 buildarch_compat: armv5b: armv4b
 buildarch_compat: armv4b: arrmeb
 buildarch_compat: armeb: noarch
+buildarch_compat: aarch64: noarch
 
 buildarch_compat: hppa2.0: hppa1.2
 buildarch_compat: hppa1.2: hppa1.1