diff --git a/gtk2-libtool.patch b/gtk2-libtool.patch
new file mode 100644
index 0000000..0d42ed7
--- /dev/null
+++ b/gtk2-libtool.patch
@@ -0,0 +1,38 @@
+--- configure.in
++++ configure.in
+@@ -377,7 +377,11 @@ AC_MSG_CHECKING([Whether to write depend
+ case $enable_explicit_deps in
+   auto)
+     export SED
++    if test -x libtool; then
+     deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
++    else
++    deplibs_check_method=`(libtool --config; echo 'eval echo $deplibs_check_method') | sh`
++    fi
+     if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
+       enable_explicit_deps=yes  
+     else
+@@ -726,7 +730,11 @@ else
+     dnl Now we check to see if our libtool supports shared lib deps
+     dnl (in a rather ugly way even)
+     if $dynworks; then
++	if test -x libtool; then
+         pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
++	else
++        pixbuf_libtool_config="libtool --config"
++	fi
+         pixbuf_deplibs_check=`$pixbuf_libtool_config | \
+             grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
+             sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
+@@ -1636,7 +1644,11 @@ AM_CONDITIONAL(TEST_PRINT_BACKEND, test
+ # We are using gmodule-no-export now, but I'm leaving the stripping
+ # code in place for now, since pango and atk still require gmodule.
+ export SED
++if test -x libtool; then
+ export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++else
++export_dynamic=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++fi
+ if test -n "$export_dynamic"; then
+   GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
+   GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/gtk2.changes b/gtk2.changes
index 750a538..bc01381 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Apr 12 00:12:28 CEST 2008 - maw@suse.de
+
+- Tag gtk2-libtool.patch, which was added in the previous
+  submission.
+
+-------------------------------------------------------------------
+Fri Apr 11 14:19:58 CEST 2008 - schwab@suse.de
+
+- Work around broken configure script.
+
 -------------------------------------------------------------------
 Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
 
diff --git a/gtk2.spec b/gtk2.spec
index 185e835..e9b1ab0 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -29,7 +29,7 @@ Group:          System/Libraries
 AutoReqProv:    on
 PreReq:         /usr/bin/touch /bin/rm /bin/rmdir
 Version:        2.12.9
-Release:        15
+Release:        16
 Summary:        Library for Creation of Graphical User Interfaces (version 2)
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2
 Source1:        SuSEconfig.gtk2
@@ -51,6 +51,8 @@ Patch24:        gtk+-2.8.6-fontsel.patch
 Patch31:        gtk+-2.8.6-fontsel-fix.patch
 Patch32:        gtk2-set-invisible-char-to-circle.patch
 Patch35:        gtk2-flash-player-busyloop.patch
+# PATCH-FIX-UPSTREAM gtk2-libtool.patch schwab@suse.de -- apparently configure.in is invoking libtool in a bad way
+Patch36:        gtk2-libtool.patch
 # Patches taken from upstream or slated to go upstream.  We can expect these to become obsolete
 # in future releases.
 # Please don't delete this comment even if this section is empty -- "# empty" should
@@ -271,6 +273,7 @@ cp -a %{S:2} .
 %patch31
 %patch32 -p1
 %patch35
+%patch36
 %patch51 -p1
 %patch52 -p1
 gnome-patch-translation-update
@@ -428,6 +431,11 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sat Apr 12 2008 maw@suse.de
+- Tag gtk2-libtool.patch, which was added in the previous
+  submission.
+* Fri Apr 11 2008 schwab@suse.de
+- Work around broken configure script.
 * Thu Apr 10 2008 ro@suse.de
 - added baselibs.conf file to build xxbit packages
   for multilib support