diff --git a/avahi-glib2.spec b/avahi-glib2.spec
index 0403180..75d5b68 100644
--- a/avahi-glib2.spec
+++ b/avahi-glib2.spec
@@ -31,7 +31,7 @@ Name:           avahi-glib2
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.27
-Release:        1
+Release:        2
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -68,8 +68,8 @@ Patch1:         avahi-desktop.patch
 Patch2:         avahi-init-lsb.patch
 #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
 Patch3:         avahi-empty-share-dir.patch
-# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
-Patch4:         avahi-gobject-introspection-1.1.patch
+# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
+Patch4:         avahi-gobject-introspection-1.2.patch
 # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
 Patch5:         avahi-fix-howl.pc.patch
 #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
diff --git a/avahi-gobject-introspection-1.1.patch b/avahi-gobject-introspection-1.1.patch
deleted file mode 100644
index 1ac2544..0000000
--- a/avahi-gobject-introspection-1.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
-===================================================================
---- avahi-0.6.27.orig/avahi-gobject/AvahiCore-0.6.gir
-+++ avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
-@@ -1,5 +1,5 @@
- <?xml version="1.0"?>
--<repository version="1.0"
-+<repository version="1.1"
-             xmlns="http://www.gtk.org/introspection/core/1.0"
-             xmlns:c="http://www.gtk.org/introspection/c/1.0"
-             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
diff --git a/avahi-gobject-introspection-1.2.patch b/avahi-gobject-introspection-1.2.patch
new file mode 100644
index 0000000..e165477
--- /dev/null
+++ b/avahi-gobject-introspection-1.2.patch
@@ -0,0 +1,32 @@
+Index: avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
+===================================================================
+--- avahi-0.6.27.orig/avahi-gobject/AvahiCore-0.6.gir
++++ avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
+@@ -1,10 +1,12 @@
+ <?xml version="1.0"?>
+-<repository version="1.0"
++<repository version="1.2"
+             xmlns="http://www.gtk.org/introspection/core/1.0"
+             xmlns:c="http://www.gtk.org/introspection/c/1.0"
+             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+   <namespace name="AvahiCore" version="0.6" shared-library="avahi-core">
+-    <alias name="IfIndex" target="int" c:type="AvahiIfIndex"/>
++    <alias name="IfIndex" c:type="AvahiIfIndex">
++      <type name="gint" c:type="int"/>
++    </alias>
+     <enumeration name="Protocol" c:type="AvahiProtocol">
+       <member name="inet"
+               value="0"
+Index: avahi-0.6.27/configure.ac
+===================================================================
+--- avahi-0.6.27.orig/configure.ac
++++ avahi-0.6.27/configure.ac
+@@ -472,7 +472,7 @@ AM_CONDITIONAL(HAVE_GOBJECT, test "x$HAV
+ #
+ # Introspection support.
+ #
+-GOBJECT_INTROSPECTION_CHECK([0.6.7])
++GOBJECT_INTROSPECTION_CHECK([0.9.5])
+ 
+ #
+ # Check for Qt 3
diff --git a/avahi-mono.spec b/avahi-mono.spec
index f04dc2a..1aeeb43 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -31,7 +31,7 @@ Name:           avahi-mono
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.27
-Release:        1
+Release:        2
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -68,8 +68,8 @@ Patch1:         avahi-desktop.patch
 Patch2:         avahi-init-lsb.patch
 #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
 Patch3:         avahi-empty-share-dir.patch
-# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
-Patch4:         avahi-gobject-introspection-1.1.patch
+# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
+Patch4:         avahi-gobject-introspection-1.2.patch
 # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
 Patch5:         avahi-fix-howl.pc.patch
 #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
diff --git a/avahi-qt4.spec b/avahi-qt4.spec
index 6183363..b54f6ed 100644
--- a/avahi-qt4.spec
+++ b/avahi-qt4.spec
@@ -31,7 +31,7 @@ Name:           avahi-qt4
 %define         build_qt3 0
 %define         build_qt4 1
 Version:        0.6.27
-Release:        1
+Release:        2
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -68,8 +68,8 @@ Patch1:         avahi-desktop.patch
 Patch2:         avahi-init-lsb.patch
 #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
 Patch3:         avahi-empty-share-dir.patch
-# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
-Patch4:         avahi-gobject-introspection-1.1.patch
+# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
+Patch4:         avahi-gobject-introspection-1.2.patch
 # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
 Patch5:         avahi-fix-howl.pc.patch
 #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
diff --git a/avahi.changes b/avahi.changes
index 6629ebe..14769bf 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 18 17:29:54 CEST 2010 - vuntz@opensuse.org
+
+- Rename avahi-gobject-introspection-1.1.patch to
+  avahi-gobject-introspection-1.2.patch and update it to the 1.2
+  format.
+
 -------------------------------------------------------------------
 Wed Sep  1 13:23:37 CEST 2010 - vuntz@opensuse.org
 
diff --git a/avahi.spec b/avahi.spec
index c46f088..0f5bb46 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -33,7 +33,7 @@ Name:           avahi
 %define         build_qt3 0
 %define         build_qt4 0
 Version:        0.6.27
-Release:        1
+Release:        2
 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
 # Create split spec files only when building per partes:
 #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
@@ -70,8 +70,8 @@ Patch1:         avahi-desktop.patch
 Patch2:         avahi-init-lsb.patch
 #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
 Patch3:         avahi-empty-share-dir.patch
-# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
-Patch4:         avahi-gobject-introspection-1.1.patch
+# PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.2.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
+Patch4:         avahi-gobject-introspection-1.2.patch
 # PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
 Patch5:         avahi-fix-howl.pc.patch
 #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default