diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 2aef6b1..0836b66 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,6 +1,6 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
-Version: 8.0.39
+Version: 8.0.40
 Release: 1
 License: GPL
 Group: Development/System
@@ -35,6 +35,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Fri Feb  3 2006 Jeremy Katz <katzj@redhat.com> - 8.0.40-1
+- use -mtune=generic for x86 and x86_64
+
 * Tue Aug 16 2005 Elliot Lee <sopwith@redhat.com> - 8.0.39-1
 - Fix #165416
 
diff --git a/rpmrc b/rpmrc
index da849c3..dccaa7e 100644
--- a/rpmrc
+++ b/rpmrc
@@ -1,12 +1,12 @@
 include: /usr/lib/rpm/rpmrc
 
-optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
+optflags: i386 %{__global_cflags} -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
 optflags: i486 %{__global_cflags} -m32 -march=i486 -fasynchronous-unwind-tables
 optflags: i586 %{__global_cflags} -m32 -march=i586 -fasynchronous-unwind-tables
-optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=pentium4 -fasynchronous-unwind-tables
+optflags: i686 %{__global_cflags} -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
 optflags: athlon %{__global_cflags} -m32 -march=athlon -fasynchronous-unwind-tables
 optflags: ia64 %{__global_cflags}
-optflags: x86_64 %{__global_cflags} -m64 -mtune=nocona
+optflags: x86_64 %{__global_cflags} -m64 -mtune=generic
 
 optflags: alpha %{__global_cflags} -mieee
 optflags: alphaev5 %{__global_cflags} -mieee -mcpu=ev5