diff --git a/imlib2.spec b/imlib2.spec
index 3b63968..a9bd15e 100644
--- a/imlib2.spec
+++ b/imlib2.spec
@@ -1,7 +1,7 @@
 Summary:        Image loading, saving, rendering, and manipulation library
 Name:           imlib2
 Version:        1.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        Imlib2
 Group:          System Environment/Libraries
 URL:            http://docs.enlightenment.org/api/imlib2/html/
@@ -72,13 +72,9 @@ asmopts="--disable-mmx --disable-amd64"
 %ifarch %{ix86}
 asmopts="--enable-mmx --disable-amd64"
 %endif
-%ifarch x86_64
-asmopts="--disable-mmx --enable-amd64"
-%endif
 
 # Note: --disable-static doesn't work as of 1.2.1.
 %configure --disable-dependency-tracking --with-pic $asmopts
-
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 
@@ -132,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/imlib2/loaders/id3.*
 
 %changelog
+* Tue Mar 11 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 1.4.0-6
+- Disable amd64 assembly optimization. (Kills idesk - #222998, #436924)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.4.0-5
 - Autorebuild for GCC 4.3