diff --git a/.cvsignore b/.cvsignore
index a91e59f..9ad3218 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtk+-2.90.0.tar.bz2
+gtk+-2.90.1.tar.bz2
diff --git a/gtk3.spec b/gtk3.spec
index 6b31c2a..f76a34d 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -11,19 +11,15 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk3
-Version: 2.90.0
-Release: 5%{?dist}
+Version: 2.90.1
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 #VCS: git:git://git.gnome.org/gtk+
 Source: http://download.gnome.org/sources/gtk+/2.90/gtk+-%{version}.tar.bz2
-Source1: update-gdk-pixbuf-loaders-3.0
-Source2: update-gtk-immodules-3.0
 Source3: im-cedilla.conf
 
-# Biarch changes
-Patch0: gtk-lib64.patch
 Patch1: system-python.patch
 
 BuildRequires: atk-devel >= %{atk_version}
@@ -115,8 +111,6 @@ widget toolkit.
 
 %prep
 %setup -q -n gtk+-%{version}
-
-%patch0 -p1 -b .lib64
 %patch1 -p1 -b .system-python
 
 %build
@@ -140,31 +134,6 @@ awk '/^Overview of Changes/ { seen+=1 }
 
 
 %install
-# Deriving /etc/gtk-3.0/$host location
-# NOTE: Duplicated below
-#
-# autoconf changes linux to linux-gnu
-case "%{_host}" in
-  *linux) host="%{_host}-gnu"
-  ;;
-  *) host="%{_host}"
-  ;;
-esac
-
-# autoconf uses powerpc not ppc
-host=`echo $host | sed "s/^ppc/powerpc/"`
-# autoconf uses ibm-linux not redhat-linux (s390x)
-host=`echo $host | sed "s/^s390\(x\)*-redhat/s390\1-ibm/"`
-
-# Make sure that the host value that is passed to the compile
-# is the same as the host that we're using in the spec file
-#
-compile_host=`grep 'host_triplet =' gtk/Makefile | sed "s/.* = //"`
-
-if test "x$compile_host" != "x$host" ; then
-  echo 1>&2 "Host mismatch: compile='$compile_host', spec file='$host'" && exit 1
-fi
-
 make install DESTDIR=$RPM_BUILD_ROOT        \
              RUN_QUERY_IMMODULES_TEST=false \
              RUN_QUERY_LOADER_TEST=false
@@ -173,6 +142,7 @@ make install DESTDIR=$RPM_BUILD_ROOT        \
 %find_lang gtk30-properties
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0
+
 #
 # Make cleaned-up versions of tutorials, examples, and faq for installation
 #
@@ -189,70 +159,48 @@ for dir in examples/* ; do
   fi
 done
 
-# We need to have separate 32-bit and 64-bit binaries
-# for places where we have two copies of the GTK+ package installed.
-# (we might have x86_64 and i686 packages on the same system, for example.)
-case "$host" in
-  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
-   mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0-64
-   mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0 $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0-64
-   ;;
-  *
-   mv $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0 $RPM_BUILD_ROOT%{_bindir}/gtk-query-immodules-3.0-32
-   mv $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0 $RPM_BUILD_ROOT%{_bindir}/gdk-pixbuf-query-loaders-3.0-32
-   ;;
-esac
-
-# Install wrappers for the binaries
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders-3.0
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules-3.0
+(cd $RPM_BUILD_ROOT%{_bindir}
+ mv gtk-query-immodules-3.0 gtk-query-immodules-3.0-%{__isa_bits}
+ mv gdk-pixbuf-query-loaders-3.0 gdk-pixbuf-query-loaders-3.0-%{__isa_bits}
+)
 
 # Input method frameworks want this
-install -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d
+install -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/im-cedilla.conf
 
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/*/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/*/*.la
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host/gtk.immodules
-touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0/$host/gdk-pixbuf.loaders
+touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
+touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{bin_version}/loaders.cache
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/immodules
 
-#
-# We need the substitution of $host so we use an external
-# file list
-#
-echo %dir %{_sysconfdir}/gtk-3.0/$host >> gtk30.lang
-echo %ghost %{_sysconfdir}/gtk-3.0/$host/gtk.immodules >> gtk30.lang
-echo %ghost %{_sysconfdir}/gtk-3.0/$host/gdk-pixbuf.loaders >> gtk30.lang
-
 %post
 /sbin/ldconfig
-/usr/bin/update-gdk-pixbuf-loaders-3.0 %{_host}
-/usr/bin/update-gtk-immodules-3.0 %{_host}
+gdk-pixbuf-query-loaders-3.0-%{__isa_bits} --update-cache
+gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 
 %post immodules
-/usr/bin/update-gtk-immodules-3.0 %{_host}
+gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 
 %post immodule-xim
-/usr/bin/update-gtk-immodules-3.0 %{_host}
+gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 
 %postun
 /sbin/ldconfig
 if [ $1 -gt 0 ]; then
-  /usr/bin/update-gdk-pixbuf-loaders-3.0 %{_host}
-  /usr/bin/update-gtk-immodules-3.0 %{_host}
+  gdk-pixbuf-query-loaders-3.0-%{__isa_bits} --update-cache
+  gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 fi
 
 %postun immodules
-/usr/bin/update-gtk-immodules-3.0 %{_host}
+gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 
 %postun immodule-xim
-/usr/bin/update-gtk-immodules-3.0 %{_host}
+gtk-query-immodules-3.0-%{__isa_bits} --update-cache
 
 %files -f gtk30.lang
 %defattr(-, root, root, -)
@@ -261,8 +209,6 @@ fi
 %{_bindir}/gdk-pixbuf-query-loaders-3.0*
 %{_bindir}/gtk-query-immodules-3.0*
 %{_bindir}/gtk-update-icon-cache-3.0
-%{_bindir}/update-gdk-pixbuf-loaders-3.0
-%{_bindir}/update-gtk-immodules-3.0
 %{_libdir}/libgtk-x11-3.0.so.*
 %{_libdir}/libgdk-x11-3.0.so.*
 %{_libdir}/libgdk_pixbuf-3.0.so.*
@@ -279,12 +225,13 @@ fi
 %{_datadir}/themes/Default
 %{_datadir}/themes/Emacs
 %{_datadir}/themes/Raleigh
-%dir %{_sysconfdir}/gtk-3.0
 %{_libdir}/girepository-1.0
-# TODO: fix man page installation upstream
-#%{_mandir}/man1/gdk-pixbuf-query-loaders-3.0.1
-#%{_mandir}/man1/gtk-query-immodules-3.0.1
-#%{_mandir}/man1/gtk-update-icon-cache-3.0.1
+%dir %{_sysconfdir}/gtk-3.0
+%ghost %{_libdir}/gtk-3.0/%{bin_version}/loaders.cache
+%ghost %{_libdir}/gtk-3.0/%{bin_version}/immodules.cache
+# %{_mandir}/man1/gdk-pixbuf-query-loaders-3.0.1
+# %{_mandir}/man1/gtk-query-immodules-3.0.1
+# %{_mandir}/man1/gtk-update-icon-cache-3.0.1
 
 %files immodules
 %defattr(-, root, root, -)
@@ -321,13 +268,16 @@ fi
 %files devel-docs
 %defattr(-, root, root, -)
 %{_datadir}/gtk-doc/html/*
-#%{_mandir}/man1/gdk-pixbuf-csource-3.0.1
-#%{_mandir}/man1/gtk-builder-convert-3.0.1
+# %{_mandir}/man1/gdk-pixbuf-csource-3.0.1
+# %{_mandir}/man1/gtk-builder-convert-3.0.1
 %doc tmpdocs/tutorial
 %doc tmpdocs/faq
 %doc tmpdocs/examples
 
 %changelog
+* Tue May 25 2010 Matthias Clasen <mclasen@redhat.com> 2.90.1-1
+- Update to 2.90.1
+
 * Fri May 21 2010 Matthias Clasen <mclasen@redhat.com> 2.90.0-5
 - Some more package review feedback
 
diff --git a/sources b/sources
index 0091bae..e6eefc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd30684a0f7ced548add1bd5e23ff439  gtk+-2.90.0.tar.bz2
+f6f7788d7fd7a09e3c16714f53296460  gtk+-2.90.1.tar.bz2