diff --git a/gobject-introspection-fix-regress.patch b/gobject-introspection-fix-regress.patch
new file mode 100644
index 0000000..62c480e
--- /dev/null
+++ b/gobject-introspection-fix-regress.patch
@@ -0,0 +1,21 @@
+commit f02d8bd8aca34817a9085fc700fad88c874e3f18
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Fri Sep 2 18:40:54 2011 +0200
+
+    Fix wrong type of variable in regression test
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=658075
+
+diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
+index 04b4950..d44e692 100644
+--- a/tests/scanner/regress.c
++++ b/tests/scanner/regress.c
+@@ -224,7 +224,7 @@ regress_test_closure_variant (GClosure *closure, const GVariant* arg)
+ {
+   GValue return_value = {0, };
+   GValue arguments[1] = {{0,} };
+-  int ret;
++  GVariant *ret;
+ 
+   g_value_init (&return_value, G_TYPE_VARIANT);
+ 
diff --git a/gobject-introspection.changes b/gobject-introspection.changes
index 84822e1..14f55e2 100644
--- a/gobject-introspection.changes
+++ b/gobject-introspection.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep  2 16:39:40 UTC 2011 - vuntz@opensuse.org
+
+- Add gobject-introspection-fix-regress.patch: fix wrong type for a
+  variable, which was causing build issues in gjs and
+  python-gobject.
+
 -------------------------------------------------------------------
 Fri Sep  2 12:33:16 UTC 2011 - vuntz@opensuse.org
 
diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index 36720c1..e3a37d5 100644
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -31,6 +31,8 @@ Source1:        gi-find-deps.sh
 Source2:        gobjectintrospection.attr
 Source3:        gobject-introspection-typelib.template
 Source99:       %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM gobject-introspection-fix-regress.patch bgo#658075 vuntz@opensuse.org -- Fix wrong type for variable
+Patch0:         gobject-introspection-fix-regress.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
@@ -77,6 +79,7 @@ a uniform, machine readable format.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh