diff --git a/qemu-0.7.0-build.patch b/qemu-0.7.0-build.patch
index 97ea8dd..404e5d8 100644
--- a/qemu-0.7.0-build.patch
+++ b/qemu-0.7.0-build.patch
@@ -4,7 +4,7 @@
  -include config-host.mak
  
 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
-+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing 
++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing 
  ifdef CONFIG_DARWIN
  CFLAGS+= -mdynamic-no-pic
  endif
@@ -15,7 +15,7 @@
  DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
  endif
 -CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing
++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing 
  #CFLAGS+=-Werror
  LDFLAGS=-g
  LIBS=
@@ -24,7 +24,7 @@
  # -msmall-data is not used because we want two-instruction relocations
  # for the constant constructions
 -OP_CFLAGS=-Wall -O2 -g
-+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall
++OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall
  # Ensure there's only a single GP
  CFLAGS += -msmall-data
  LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld
diff --git a/qemu.spec b/qemu.spec
index 2bc460b..282a3fe 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -74,6 +74,9 @@ fi
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Fri Mar 17 2006 David Woodhouse <dwmw2@infradead.org> 0.8.0-2
+- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it
+
 * Fri Mar 17 2006 David Woodhouse <dwmw2@infradead.org> 0.8.0-1
 - Update to 0.8.0
 - Resort to using compat-gcc-32