diff --git a/gtk+-2.91.5.tar.bz2 b/gtk+-2.91.5.tar.bz2
deleted file mode 100644
index ad6758d..0000000
--- a/gtk+-2.91.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3893a158682e4954e31847c5f4aaa1b1f0ff259cff8d141f8ed8a58121e2cc21
-size 16380309
diff --git a/gtk+-2.99.2.tar.bz2 b/gtk+-2.99.2.tar.bz2
new file mode 100644
index 0000000..5f17d74
--- /dev/null
+++ b/gtk+-2.99.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fca4b39359e7ab9532aaf826518ef5d3f6ba5174799883f8b0975783f76db4ad
+size 17240205
diff --git a/gtk3.changes b/gtk3.changes
index e97ba1a..cfb4ffd 100644
--- a/gtk3.changes
+++ b/gtk3.changes
@@ -1,3 +1,134 @@
+-------------------------------------------------------------------
+Thu Jan 13 08:54:20 CET 2011 - vuntz@opensuse.org
+
+- Update to version 2.99.2:
+  + More widgets are using GtkStyleContext directly.
+  + gtk-builder-convert now accepts a --target-version option
+  + Bug fixes: bgo#637965, bgo#639127, bgo#639157, bgo#639209,
+    bgo#639286, bgo#639327.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Jan 12 19:12:55 CET 2011 - vuntz@opensuse.org
+
+- Update to version 2.99.1:
+  + More widgets are using GtkStyleContext directly.
+  + GtkBuilder support has been added for setting menus on
+    GtkMenuToolButtons and for adding tags to GtkTextTagTable as
+    well as adding items to GtkComboBoxText.
+  + Bug fixes: bgo#350618, bgo#612918, bgo#635687, bgo#638017,
+    bgo#638119, bgo#638880, bgo#639030, bgo#639047, bgo#639079,
+    bgo#639105, bgo#639106, bgo#639127, bgo#639157.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Jan  7 16:55:29 CET 2011 - vuntz@opensuse.org
+
+- Update to version 2.99.0:
+  + Various API deprecations and removals, see NEWS for details.
+  + The gtk-update-icon-cache and gtk-builder-convert utilities
+    have been renamed back to their un-suffixed names.
+    Distributions will have to resolve the conflict between GTK+
+    2.x and 3.0 packages by dropping one set of the utilities and
+    adding a dependency.
+  + It is now possible to include multiple GDK backends in a single
+    library. The --with-gdk-backend option has been split into
+    separate --enable-{x11,win32,quartz}-backend options.
+  + The GDK Quartz backend has been ported to the new GDK backend
+    API.
+  + A number of widgets have been ported to use GtkStyleContext
+    directly.
+  + Various problems with width-for-height geometry management have
+    been fixed in GtkAlignment, GtkCheckButton, GtkBin.
+  + The GtkComboBox, GtkIconView and GtkCellView widgets have been
+    ported to use GtkCellArea for their cell layouts.
+  + The cups print backend can now send print jobs directly in PDF
+    if cups supports it.
+  + GtkNumerableIcon is a variant of GEmblemedIcon for using
+    numbers as emblems.
+  + Bugs fixed: bgo#144324, bgo#165987, bgo#307963, bgo#321958,
+    bgo#533745, bgo#553404, bgo#559503, bgo#560177, bgo#562182,
+    bgo#599130, bgo#617312, bgo#617315, bgo#617322, bgo#617327,
+    bgo#617471, bgo#621720, bgo#622125, bgo#629955, bgo#633795,
+    bgo#634711, bgo#635299, bgo#637691, bgo#637721, bgo#637736,
+    bgo#637763, bgo#637834, bgo#637849, bgo#637895, bgo#637907,
+    bgo#637910, bgo#637958, bgo#637974, bgo#638179, bgo#638193,
+    bgo#638231, bgo#638386, bgo#638580, bgo#638608.
+  + Updated translations.
+- Remove --with-xinput=xfree from configure call: the option
+  has been renamed to --enable-xinput, and there's no need to
+  specify it in our case, really.
+- Use update-alternatives mechanism for gtk-update-icon-cache and
+  gtk-builder-convert since both tools are shipped with the same
+  names in gtk2 and gtk3:
+  + Rename the non-versioned tools and man pages to versioned
+    filenames.
+  + Add update-alternatives Requires(post/postun) to tools and
+    devel subpackages.
+  + Call update-alterantives in %post/%postun of the tools and
+    devel subpackages.
+
+-------------------------------------------------------------------
+Wed Dec 22 21:14:11 CET 2010 - dimstar@opensuse.org
+
+- Update to version 2.91.7:
+  + The treeview-refactor branch has been merged, bringing more
+    flexible cell arrangement with GtkCellArea, GtkCellAreaBox,
+    etc.
+  + The gdk-backend branch has been merged. This branch cleans up
+    the internal frontend/backend separation in GDK, with the
+    ultimate goal of allowing to build a single gdk library that
+    contains multiple backends (interesting combinations are
+    x11+wayland or quartz+x11).
+  + Various API deprecations and removals, see NEWS for details.
+  + A number of GTK+ widgets have been ported to use
+    GtkStyleContext directly for rendering.
+  + The tracker search backend for the file chooser has been
+    updated to work with libtracker-sparql as available in
+    tracker >= 0.9.
+  + The GtkAboutDialog has been given a facelift. It no longer
+    opens second-level dialogs.
+  + The GDK X11 backend now uses XI2 (including multi-device
+    capabilities) by default. Use gdk_disable_multidevice() to
+    switch back to the XI1/Core implementation.
+  + Bugs fixed: bgo#629923, bgo#634657, bgo#635401, bgo#636732,
+    bgo#636777, bgo#637018, bgo#637069, bgo#637155, bgo#637156,
+    bgo#637189, bgo#637243, bgo#637256, bgo#637464, bgo#637471,
+    bgo#637520, bgo#637606, bgo#637608
+  + Updated translations.
+- Remove -DGTK_COMPILATION in CFLAGS fixup: it's no longer needed.
+- Enable parallel build again.
+
+-------------------------------------------------------------------
+Sat Dec 11 23:58:35 CET 2010 - dimstar@opensuse.org
+
+- Update to version 2.91.6:
+  + Deprecations, cleanups and API changes:
+    - GdkDrawable and some X11-specific APIs have been removed
+    - GtkStyle and GtkRcStyle have been deprecated
+    - The GdkWindowClass enumeration is now GdkWindowWindowClass
+    - gdk_window_get_geometry lost its depth argument
+    - The old, unused gtk_decorated_window_... functions have been
+      removed.
+  + GtkComboBox has gained an 'active id' property that is
+    intended for easy binding to settings
+  + GtkAppChooser: A new family of widgets that allow choosing
+    an application to open a file. This is strongly based on
+    the corresponding nautilus dialog, which it is replacing.
+  + The GtkStyleContext branch has been merged, changing the APIs
+    that are used to do themed drawing, and the theme engine
+    interfaces. Among the new classes are GtkStyleContext
+    (replacing GtkStyle) and GtkCssProvider (replacing the gtkrc
+    parser). The migration guide contains a chapter about porting
+    from GtkStyle to GtkStyleContext.
+  + Bugs fixed: bgo#549720, bgo#582557, bgo#619148, bgo#636060,
+    bgo#636129, bgo#636388, bgo#636511
+  + Updated translations.
+- Note: this update will break GTK+ 3 engines that were not ported
+  to the new API.
+- Add -DGTK_COMPILATION to CFLAGS to fix a build issue.
+- Remove kg translation on 11.3 and earlier.
+
 -------------------------------------------------------------------
 Tue Nov 30 09:48:47 CET 2010 - dimstar@opensuse.org
 
diff --git a/gtk3.spec b/gtk3.spec
index e6238b3..a523eb7 100644
--- a/gtk3.spec
+++ b/gtk3.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gtk3 (Version 2.91.5)
+# spec file for package gtk3 (Version 2.99.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands
@@ -22,9 +22,8 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        2.91.5
+Version:        2.99.2
 Release:        1
-# FIXME: 2.90.5 doesn't compile with parallel build (bgo#624304). Check if this is still true for later versions.
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3)
 Url:            http://www.gtk.org/
@@ -217,6 +216,8 @@ This package provides an input method based on the X Input Method.
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Tools
 Group:          System/Libraries
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 
 %description tools
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -255,6 +256,8 @@ Group:          Development/Libraries/X11
 Requires:       libgtk-3_0-0 = %{version}
 # gtk-builder-convert needs this.
 Requires:       python-xml
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 
 %description devel
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -280,15 +283,15 @@ gnome-patch-translation-update
 %configure \
         --disable-static \
         --enable-man \
-        --with-xinput=xfree \
         --enable-introspection
-# building of gobject-introspection seems to fail with -j 'n>1' (see bgo#624304)
-#%{__make} %{?_smp_mflags}
-%{__make}
+%{__make} V=1 %{?_smp_mflags}
 
 %install
 %makeinstall
 find %{buildroot}%{_libdir} -name '*.la' -delete -print
+%if 0%{?suse_version} <= 1130
+%{__rm} %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/*
+%endif
 %find_lang gtk30
 %find_lang gtk30-properties
 install -m 644 -D %{S:2} %{buildroot}%{_sysconfdir}/gtk-3.0/gtkrc
@@ -297,6 +300,19 @@ touch %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
   mv %{buildroot}%{_bindir}/gtk-query-immodules-3.0 %{buildroot}%{_bindir}/gtk-query-immodules-3.0-64
   mv %{buildroot}%{_mandir}/man1/gtk-query-immodules-3.0.1 %{buildroot}%{_mandir}/man1/gtk-query-immodules-3.0-64.1
 %endif
+# create theming-engines directory that should have been created during the build
+test ! -d %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
+mkdir %{buildroot}%{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines
+# Alternatives for gtk-update-icon-cache and gtk-builder-convert
+mv %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-update-icon-cache-3.0
+mv %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1 %{buildroot}%{_mandir}/man1/gtk-update-icon-cache-3.0.1
+mv %{buildroot}%{_bindir}/gtk-builder-convert %{buildroot}%{_bindir}/gtk-builder-convert-3.0
+mv %{buildroot}%{_mandir}/man1/gtk-builder-convert.1 %{buildroot}%{_mandir}/man1/gtk-builder-convert-3.0.1
+touch %{buildroot}%{_bindir}/gtk-update-icon-cache
+touch %{buildroot}%{_mandir}/man1/gtk-update-icon-cache.1
+touch %{buildroot}%{_bindir}/gtk-builder-convert
+touch %{buildroot}%{_mandir}/man1/gtk-builder-convert.1
+chmod a+x %{buildroot}%{_bindir}/gtk-update-icon-cache %{buildroot}%{_bindir}/gtk-builder-convert
 # Install rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cp %{S:3} %{buildroot}%{_sysconfdir}/rpm
@@ -363,6 +379,20 @@ if [ $1 == 1 ]; then
     %{_gtk_query_immodules_update_cache}
   fi
 fi
+%if 0
+# If the gtk-update-icon-cache group is in automatic mode, then this will also
+# switch all symlinks automatically
+%endif
+update-alternatives --install %{_bindir}/gtk-update-icon-cache gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0 3 \
+                    --slave %{_mandir}/man1/gtk-update-icon-cache.1.gz gtk-update-icon-cache.1.gz %{_mandir}/man1/gtk-update-icon-cache-3.0.1.gz
+
+%post devel
+%if 0
+# If the gtk-builder-convert group is in automatic mode, then this will also
+# switch all symlinks automatically
+%endif
+update-alternatives --install %{_bindir}/gtk-builder-convert gtk-builder-convert %{_bindir}/gtk-builder-convert-3.0 3 \
+                    --slave %{_mandir}/man1/gtk-builder-convert.1.gz gtk-builder-convert.1.gz %{_mandir}/man1/gtk-builder-convert-3.0.1.gz
 
 %post data
 %glib2_gsettings_schema_post
@@ -399,6 +429,22 @@ fi
 %postun data
 %glib2_gsettings_schema_postun
 
+%postun tools
+%if 0
+# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed
+%endif
+if [ ! -f %{_bindir}/gtk-update-icon-cache-3.0 ]; then
+  update-alternatives --remove gtk-update-icon-cache %{_bindir}/gtk-update-icon-cache-3.0
+fi
+
+%postun devel
+%if 0
+# Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed
+%endif
+if [ ! -f %{_bindir}/gtk-builder-convert-3.0 ]; then
+  update-alternatives --remove gtk-builder-convert %{_bindir}/gtk-builder-convert-3.0
+fi
+
 %files -n libgtk-3_0-0
 %defattr(-, root, root)
 %doc AUTHORS COPYING README NEWS ChangeLog
@@ -408,8 +454,6 @@ fi
 %dir %{_sysconfdir}/gtk-3.0
 %dir %{_libdir}/gtk-3.0
 %dir %{_libdir}/gtk-3.0/%{gtk_binary_version}
-%dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/engines
-%{_libdir}/gtk-3.0/%{gtk_binary_version}/engines/libpixmap.so
 %dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-cedilla.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-cyrillic-translit.so
@@ -418,12 +462,13 @@ fi
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/printbackends/libprintbackend-cups.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/printbackends/libprintbackend-file.so
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/printbackends/libprintbackend-lpr.so
+%dir %{_libdir}/gtk-3.0/%{gtk_binary_version}/theming-engines/
 %ghost %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules.cache
 %dir %{_libdir}/gtk-3.0/modules
 %{_libdir}/gtk-3.0/modules/libgail.so
 %{_libdir}/libgailutil-3.0.so.*
-%{_libdir}/libgdk-x11-3.0.so.*
-%{_libdir}/libgtk-x11-3.0.so.*
+%{_libdir}/libgdk-3.0.so.*
+%{_libdir}/libgtk-3.0.so.*
 %{_libdir}/girepository-1.0/Gdk-3.0.typelib
 %{_libdir}/girepository-1.0/GdkX11-3.0.typelib
 %{_libdir}/girepository-1.0/Gtk-3.0.typelib
@@ -463,8 +508,10 @@ fi
 %defattr(-,root,root)
 %{_bindir}/gtk-query-immodules-3.0*
 %{_bindir}/gtk-update-icon-cache-3.0
+%ghost %{_bindir}/gtk-update-icon-cache
 %{_mandir}/man1/gtk-query-immodules-3.0*.1*
 %{_mandir}/man1/gtk-update-icon-cache-3.0.1*
+%ghost %{_mandir}/man1/gtk-update-icon-cache.1*
 
 %files data
 %defattr(-,root,root)
@@ -486,14 +533,15 @@ fi
 %doc %{_datadir}/gtk-doc/html/gtk3/
 %{_bindir}/gtk3-demo
 %{_bindir}/gtk-builder-convert-3.0
+%ghost %{_bindir}/gtk-builder-convert
 %{_mandir}/man1/gtk-builder-convert-3.0.1*
+%ghost %{_mandir}/man1/gtk-builder-convert.1*
 %{_datadir}/aclocal/gtk-3.0.m4
 %{_datadir}/gir-1.0/*.gir
 %dir %{_datadir}/gtk-3.0
 %{_datadir}/gtk-3.0/demo/
 %{_includedir}/gail-3.0/
 %{_includedir}/gtk-3.0/
-%{_libdir}/gtk-3.0/include/
 %{_libdir}/gtk-3.0/modules/libferret.so
 %{_libdir}/pkgconfig/gail-3.0.pc
 %{_libdir}/pkgconfig/gdk-3.0.pc
@@ -502,8 +550,8 @@ fi
 %{_libdir}/pkgconfig/gtk+-unix-print-3.0.pc
 %{_libdir}/pkgconfig/gtk+-x11-3.0.pc
 %{_libdir}/libgailutil-3.0.so
-%{_libdir}/libgdk-x11-3.0.so
-%{_libdir}/libgtk-x11-3.0.so
+%{_libdir}/libgdk-3.0.so
+%{_libdir}/libgtk-3.0.so
 %{_sysconfdir}/rpm/macros.gtk3
 
 %changelog