diff --git a/macros b/macros
index 01394c4..f062f94 100644
--- a/macros
+++ b/macros
@@ -133,6 +133,8 @@ print(result)
 
 # Architecture-specific support.  Internal.  Do not use directly.
 
+%__cflags_arch_x86_64 %[0%{?rhel} >= 9 && "%{toolchain}" == "gcc" ? "-march=x86-64-v2" : ""]
+
 # Also used for s390.
 %__cflags_arch_s390x %[0%{?rhel} >= 8 ? "-march=z13 -mtune=z14" : "-march=zEC12 -mtune=z13"]
 
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 21813b4..d54b4f6 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 178
+Version: 180
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -213,6 +213,12 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Tue Jan 19 2021 Florian Weimer <fweimer@redhat.com> - 180-1
+- Use -march=x86-64-v2 only for the gcc toolchain
+
+* Tue Jan 19 2021 Florian Weimer <fweimer@redhat.com> - 179-1
+- x86_64: Enable -march=x86-64-v2 for ELN, following GCC.
+
 * Sun Nov 29 2020 Miro Hrončok <mhroncok@redhat.com> - 178-1
 - BRP Python Bytecompile: Also detect Python files in /app/lib/pythonX.Y
 
diff --git a/rpmrc b/rpmrc
index ba31d2a..12d5979 100644
--- a/rpmrc
+++ b/rpmrc
@@ -6,7 +6,7 @@ optflags: i586 %{__global_compiler_flags} -m32 -march=i586 -mtune=generic -fasyn
 optflags: i686 %{__global_compiler_flags} -m32 -march=i686 -mtune=generic -msse2 -mfpmath=sse -mstackrealign -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection
 optflags: athlon %{__global_compiler_flags} -m32 -march=athlon -fasynchronous-unwind-tables -fstack-clash-protection
 optflags: ia64 %{__global_compiler_flags}
-optflags: x86_64 %{__global_compiler_flags} -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection
+optflags: x86_64 %{__global_compiler_flags} -m64 %{__cflags_arch_x86_64} -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection
 
 optflags: alpha %{__global_compiler_flags} -mieee
 optflags: alphaev5 %{__global_compiler_flags} -mieee -mcpu=ev5