diff --git a/ChangeLog b/ChangeLog
index 61eda833f9..33a2920e42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gst-ffmpeg.spec.in:
+	  Build with -O1 by default since otherwise assembler breaks
+
 2006-10-24  Edward Hervey  <edward@fluendo.com>
 
 	* ext/ffmpeg/gstffmpegcfg.c:
@@ -11,12 +16,6 @@
 	Use EPZS (Enhanced Predictive Zonal Search) as the default motion
 	estimation method, since it's the best quality to speed compromise.
 
-2006-10-20  Thomas Vander Stichele  <thomas at apestaart dot org>
-
-	reviewed by: <delete if not using a buddy>
-
-	* gst-ffmpeg.spec.in:
-
 2006-10-20  Mark Nauwelaerts <manauw@skynet.be>
 
 	Reviewed by: Edward Hervey  <edward@fluendo.com>
diff --git a/gst-ffmpeg.spec.in b/gst-ffmpeg.spec.in
index 9cb14e3ae7..8ddf336ecd 100644
--- a/gst-ffmpeg.spec.in
+++ b/gst-ffmpeg.spec.in
@@ -38,7 +38,7 @@ multimedia formats.
 %build
 %configure
 
-make %{?_smp_mflags} CFLAGS=-Wno-error
+make %{?_smp_mflags} CFLAGS="-Wno-error -O1"
 
 %install
 rm -rf $RPM_BUILD_ROOT