diff --git a/gobject-introspection-0.9.10.tar.bz2 b/gobject-introspection-0.9.10.tar.bz2
deleted file mode 100644
index 86b94dd..0000000
--- a/gobject-introspection-0.9.10.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bf244db75df04499dea704e7734376c0fc5a3a17fb59be2123c8d76111e6fb8
-size 1061962
diff --git a/gobject-introspection-0.9.12.tar.bz2 b/gobject-introspection-0.9.12.tar.bz2
new file mode 100644
index 0000000..5234b82
--- /dev/null
+++ b/gobject-introspection-0.9.12.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c0060d66d14a060057a1fc005be73675a1b8a00d4968ce8e78ff2d6b9f84e81
+size 1050788
diff --git a/gobject-introspection-export-dynamic.patch b/gobject-introspection-export-dynamic.patch
deleted file mode 100644
index 24a7269..0000000
--- a/gobject-introspection-export-dynamic.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 6925adbb45889dc5277b1001e4ff33342c8e0821
-Author: Owen W. Taylor <otaylor@fishsoup.net>
-Date:   Thu Sep 30 17:57:44 2010 -0400
-
-    Add -export-dynamic when compiling with libtool
-    
-    In some cases (such as introspecting a convenience library),
-    we need to dlsym() modules in the binary we compile, so we
-    need to add -export-dynamic to the link line.
-
-diff --git a/giscanner/dumper.py b/giscanner/dumper.py
-index 26ddd7b..2da95ac 100644
---- a/giscanner/dumper.py
-+++ b/giscanner/dumper.py
-@@ -192,6 +192,8 @@ class DumpCompiler(object):
-             args.append('--silent')
- 
-         args.extend([self._linker_cmd, '-o', output])
-+        if libtool:
-+            args.append('-export-dynamic')
- 
-         cflags = os.environ.get('CFLAGS')
-         if (cflags):
diff --git a/gobject-introspection.changes b/gobject-introspection.changes
index 98bdfdb..7b0b553 100644
--- a/gobject-introspection.changes
+++ b/gobject-introspection.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Oct  9 11:23:59 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 0.9.12:
+  + Ship gtk-doc files in tarball.
+- Changes from version 0.9.11:
+  + Scanner:
+    - Add -export-dynamic when compiling with libtool.
+    - Honor -L commandline option.
+  + Various scanner fixes and improvements.
+- Drop gobject-introspection-export-dynamic.patch: fixed upstream.
+- Remove comments about upstream tarball and gtk-doc, and remove
+  gtk-doc BuildRequires: the files are in the tarball now.
+
 -------------------------------------------------------------------
 Fri Oct  1 13:48:51 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index 543e82e..ae6c6bf 100644
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gobject-introspection (Version 0.9.10)
+# spec file for package gobject-introspection (Version 0.9.12)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,9 +18,8 @@
 
 
 Name:           gobject-introspection
-Version:        0.9.10
+Version:        0.9.12
 Release:        1
-# FIXME: next tarball should have gtk-doc again, so pass --enable-gtk-doc to configure. See bgo#629871
 # FIXME: when bgo#629930 gets fixed, move the appropriate pkg-config files to the main package and rename the devel package to libgirepository-devel
 License:        LGPLv2.1+
 Summary:        GObject Introspection Tools
@@ -31,12 +30,9 @@ Source:         %{name}-%{version}.tar.bz2
 Patch0:         gobject-introspection-keyring-workaround.patch
 # PATCH-FIX-UPSTREAM gobject-introspection-libgda-workaround.patch bgo#629779 vuntz@opensuse.org -- Workaround for libgda
 Patch1:         gobject-introspection-libgda-workaround.patch
-# PATCH-FIX-UPSTREAM gobject-introspection-export-dynamic.patch vuntz@opensuse.org -- Taken from upstream, to fix builds of various gir
-Patch2:         gobject-introspection-export-dynamic.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
-BuildRequires:  gtk-doc
 BuildRequires:  libffi-devel
 BuildRequires:  python-devel
 BuildRequires:  python-xml
@@ -75,12 +71,10 @@ a uniform, machine readable format.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %configure \
         --disable-static
-#        --enable-gtk-doc
 %__make %{?jobs:-j%jobs}
 
 %install
@@ -130,7 +124,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
-#%doc %{_datadir}/gtk-doc/html/gi/
+%doc %{_datadir}/gtk-doc/html/gi/
 %{_includedir}/gobject-introspection-1.0/
 %{_libdir}/libgirepository-1.0.so
 # FIXME: those two files should be moved to the main package when bgo#629930 gets fixed