diff --git a/.cvsignore b/.cvsignore
index 7bcd8e2..30cf9c4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-imlib2-1.0.6.tar.gz
+imlib2-1.1.2.tar.gz
diff --git a/imlib2-1.0.6-demo-build.patch b/imlib2-1.0.6-demo-build.patch
deleted file mode 100644
index ebc0e69..0000000
--- a/imlib2-1.0.6-demo-build.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- demo/Makefile.am.orig	2003-10-26 23:46:26.000000000 +0100
-+++ demo/Makefile.am	2003-10-26 23:48:35.000000000 +0100
-@@ -15,4 +15,4 @@
- imconvert_SOURCES    = imconvert.c
- imlib2_view_SOURCES  = view.c 
- LDADD    = @DLLDFLAGS@ $(top_builddir)/libltdl/libltdlc.la \
--                       $(x_libs) -lttf -lImlib2
-+                       $(x_libs) -lttf -L$(top_builddir)/src/.libs -lImlib2
diff --git a/imlib2.spec b/imlib2.spec
index 99abf32..fac8763 100644
--- a/imlib2.spec
+++ b/imlib2.spec
@@ -1,22 +1,21 @@
 Summary: 	A graphic library for file loading, saving, rendering, and manipulation
 Name: 		imlib2
-Version: 	1.0.6
-Release: 	0.fdr.3.2
+Version: 	1.1.2
+Release: 	0.fdr.1.2
 Epoch:		0
 License: 	BSD
 Group: 		System Environment/Libraries
-URL: 		http://enlightenment.org/
-Source0: 	%{name}-%{version}.tar.gz
-Patch0:		imlib2-1.0.6-demo-build.patch
+URL: 		http://www.enlightenment.org/pages/imlib2.html
+Source0: 	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel libjpeg-devel libpng-devel libtiff-devel
-BuildRequires:	libungif-devel automake14 freetype-devel
+BuildRequires:	libungif-devel freetype-devel libtool bzip2-devel
 
 %package devel
 Summary: 	Development package for %{name}
 Group: 		Development/Libraries
 Requires: 	%{name} = %{epoch}:%{version}-%{release}
-Requires:	XFree86-devel freetype-devel
+Requires:	XFree86-devel freetype-devel pkgconfig
 
 # -----------------------------------------------------------------------------
 
@@ -40,19 +39,15 @@ long description of the differences.
 
 %prep
 %setup -q
-%patch0 -p0 -b .demo
-automake-1.4 -a
 
 # -----------------------------------------------------------------------------
 
 %build
-%configure	\
-%ifarch i686 athlon
-	--enable-mmx
-%else
-	--disable-mmx
+%configure \
+%ifarch %{ix86} x86_64 ia64
+  --enable-mmx
 %endif
-(cd loaders ; perl -pi -e 's|-lImlib2|-L\$(top_builddir)/src/.libs -lImlib2|g' Makefile)
+
 make %{?_smp_mflags} 
 make -C demo
 
@@ -66,7 +61,10 @@ make install DESTDIR=$RPM_BUILD_ROOT -C demo
 cp -a doc __doc
 rm -f __doc/Makefile*
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/loaders/*/*.*a
+rm -f \
+  $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
+  $RPM_BUILD_ROOT%{_libdir}/imlib2_loaders/*/*.*a \
+  $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test}
 
 # -----------------------------------------------------------------------------
 
@@ -80,11 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS README ChangeLog __doc/*
+%doc COPYING AUTHORS README ChangeLog TODO __doc/*
 %{_bindir}/imconvert
 %{_bindir}/imlib2_view
 %{_libdir}/libImlib2.so.*
-%{_libdir}/loaders
+%{_libdir}/imlib2_loaders
 
 %files devel
 %defattr(-,root,root,-)
@@ -92,10 +90,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/Imlib2.h
 %{_libdir}/libImlib2.a
 %{_libdir}/libImlib2.so
+%{_libdir}/pkgconfig/imlib2.pc
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Sat Sep 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.2-0.fdr.1
+- Update to 1.1.2, fixes CAN-2004-0802.
+- Enable MMX on all ix86, x86_64 and ia64, it seems runtime-detected.
+- Update URL.
+
 * Tue Nov 18 2003 Dams <anvil[AT]livna.org> 0:1.0.6-0.fdr.3
 - s#_prefix/lib#_libdir#
 
diff --git a/sources b/sources
index 6ed88e6..7ee88f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e3475376bf27347c47c7a9ffb49bdb96  imlib2-1.0.6.tar.gz
+3389bad516032c951fda4fe620df0cef  imlib2-1.1.2.tar.gz