diff --git a/rpmrc.in b/rpmrc.in
index f3131d8..8a19a52 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -58,14 +58,16 @@ optflags: mips %optflags_default
 optflags: mipsel %optflags_default
 
 optflags: armv3l %optflags_default -fomit-frame-pointer -march=armv3
-optflags: arm %optflags_default -march=armv4 -mno-thumb-interwork
 optflags: armv4l %optflags_default -fomit-frame-pointer -march=armv4
 optflags: armv5l %optflags_default -fomit-frame-pointer -march=armv5
 optflags: armeb %optflags_default -march=armv4 -mno-thumb-interwork
 optflags: armv4l %optflags_default -fomit-frame-pointer -march=armv4
 optflags: armv5l %optflags_default -fomit-frame-pointer -march=armv5
+optflags: arm %optflags_default -fomit-frame-pointer -march=armv5te
 optflags: armv5tel %optflags_default -fomit-frame-pointer -march=armv5te
 optflags: armv5tejl %optflags_default -fomit-frame-pointer -march=armv5te
+optflags: armv6l %optflags_default -fomit-frame-pointer -march=armv6
+optflags: armv7l %optflags_default -fomit-frame-pointer -march=armv7
 
 optflags: atarist %optflags_default -fomit-frame-pointer
 optflags: atariste %optflags_default -fomit-frame-pointer
@@ -125,6 +127,8 @@ arch_canon:	sparc64:sparc64 10
 arch_canon:	sun4u:	sparc64 10
 arch_canon:	mipsel:	mipsel	11
 
+arch_canon:	armv7l:	arm 	12
+arch_canon:	armv6l:	arm 	12
 arch_canon:	armv5tejl:	armv5tejl 	12
 arch_canon:	armv5tel:	armv5tel 	12
 arch_canon:	armv5l:	armv5l 	12
@@ -292,10 +296,11 @@ arch_compat: hppa1.1: hppa1.0
 arch_compat: hppa1.0: parisc
 arch_compat: parisc: noarch
 
+arch_compat: armv7l: armv6l
+arch_compat: armv6l: armv5l
 arch_compat: armv5tejl: armv5tel
 arch_compat: armv5tel: armv5l
-arch_compat: armv5l: armv4l
-arch_compat: armv4l: arm
+arch_compat: armv5l: arm
 arch_compat: arm: armv3l
 arch_compat: armv3l: noarch
 arch_compat: armv5b: armv4b