diff --git a/.cvsignore b/.cvsignore
index e19e395..0f7b247 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-avahi-0.6.21.tar.gz
+avahi-0.6.22.tar.gz
diff --git a/avahi.spec b/avahi.spec
index 727373c..ff8e6f2 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -5,8 +5,8 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.21
-Release:        6%{?dist}
+Version:        0.6.22
+Release:        1%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPLv2
@@ -36,11 +36,7 @@ BuildRequires:  mono-devel >= 1.1.13
 Obsoletes:            howl
 Source0:        http://avahi.org/download/%{name}-%{version}.tar.gz
 # enable mono's mcs to work in beehive buildroot:
-Patch1:     avahi-0.6.21-avahi-browse-help-fix.patch
 Patch2:     avahi-0.6.3-MONO_SHARED_DIR.patch
-Patch3:     avahi-0.6.21-initscript.patch
-Patch4:     avahi-0.6.21-libdns_sd-fix.patch
-Patch5:	    avahi-0.6.21-resolv-conf.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -88,6 +84,26 @@ Requires: glib2-devel
 The avahi-devel package contains the header files and libraries
 necessary for developing programs using avahi with glib.
 
+%package gobject
+Summary: GObject wrapper library for Avahi
+Group: System Environment/Base
+Requires: glib2
+Requires: %{name}-glib = %{version}
+
+%description gobject
+This library contains a GObject wrapper for the Avahi API
+
+%package gobject-devel
+Summary: Libraries and header files for Avahi GObject development
+Group: Development/Libraries
+Requires: %{name}-gobject = %{version}
+Requires: %{name}-devel = %{version}
+Requires: %{name}-glib-devel = %{version}
+
+%description gobject-devel
+The avahi-gobject-devel package contains the header files and libraries
+necessary for developing programs using avahi-gobject.
+
 %package ui
 Summary: Gtk user interface library for Avahi
 Group: System Environment/Base
@@ -220,13 +236,9 @@ fashion with mDNS.
 
 %prep
 %setup -q
-%patch1 -p0 -b .avahi-browse-help-fix
 %if %{WITH_MONO}
 %patch2 -p1 -b .MONO_SHARED_DIR
 %endif
-%patch3 -p0 -b .initscript
-%patch4 -p0 -b .dns_sd
-%patch5 -p2 -b .resolv_conf
 
 %build
 
@@ -239,6 +251,7 @@ fashion with mDNS.
 %endif
 ;
 make %{?_smp_mflags}
+#make %{?_smp_mflags} avahi.devhelp doxygen-run
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -311,7 +324,7 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-/sbin/ldconfig
+/sbin/ldconfig || :
 if [ "$1" -ge "1" ]; then
    /sbin/service avahi-daemon condrestart >/dev/null 2>&1 || :
 fi
@@ -352,6 +365,9 @@ fi
 %post ui -p /sbin/ldconfig
 %postun ui -p /sbin/ldconfig
 
+%post gobject -p /sbin/ldconfig
+%postun gobject -p /sbin/ldconfig
+
 %files
 %defattr(0644,root,root,0755)
 %doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service
@@ -370,6 +386,8 @@ fi
 %attr(0755,root,root) %{_libdir}/libavahi-core.so.*
 %attr(0755,root,root) %{_libdir}/libavahi-client.so.*
 %{_datadir}/avahi
+%{_datadir}/locale/*
+%{_libdir}/avahi
 %exclude %{_datadir}/avahi/interfaces
 %{_mandir}/man5/*
 %{_mandir}/man8/avahi-daemon.*
@@ -425,6 +443,16 @@ fi
 %{_includedir}/avahi-glib
 %{_libdir}/pkgconfig/avahi-glib.pc
 
+%files gobject
+%defattr(0755, root, root, 0755)
+%{_libdir}/libavahi-gobject.so.*
+
+%files gobject-devel
+%defattr(0644, root, root, 0755)
+%attr(755,root,root) %{_libdir}/libavahi-gobject.so
+%{_includedir}/avahi-gobject
+%{_libdir}/pkgconfig/avahi-gobject.pc
+
 %files ui
 %defattr(0755, root, root, 0755)
 %{_libdir}/libavahi-ui.so.*
@@ -487,6 +515,9 @@ fi
 %endif
 
 %changelog
+* Mon Dec 17 2007 Lennart Poettering <lpoetter@redhat.com> - 0.6.22-1
+- resolves #274731, #425491: New upstream version
+
 * Tue Sep 25 2007 Lennart Poettering <lpoetter@redhat.com> - 0.6.21-6
 - resolves #279301: fix segfault when no domains are configured in resolv.conf (pulled from upstream SVN r1525)
 
diff --git a/sources b/sources
index 9fa3578..10b49d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cc68f79c50c9dd9e419990c3c9b05b9  avahi-0.6.21.tar.gz
+c84b1a8a23126e188426728710414dc8  avahi-0.6.22.tar.gz