diff --git a/avahi-0.6.20.tar.bz2 b/avahi-0.6.20.tar.bz2
deleted file mode 100644
index 60f4c86..0000000
--- a/avahi-0.6.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:471a899a320ac6a2119e398b2e9dbf53728e12614c713d233692c796e05a046f
-size 678712
diff --git a/avahi-0.6.22.tar.bz2 b/avahi-0.6.22.tar.bz2
new file mode 100644
index 0000000..8cad173
--- /dev/null
+++ b/avahi-0.6.22.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78ba26f4eb52d808378062193a01193b9518cb69b5a1ddb7b8747daa05bf9aa1
+size 855716
diff --git a/avahi-desktop.patch b/avahi-desktop.patch
index fd0d2b4..d229931 100644
--- a/avahi-desktop.patch
+++ b/avahi-desktop.patch
@@ -1,7 +1,7 @@
-Index: avahi-0.6.20/avahi-ui/bssh.desktop.in
+Index: avahi-0.6.22/avahi-ui/bssh.desktop.in
 ===================================================================
---- avahi-0.6.20.orig/avahi-ui/bssh.desktop.in
-+++ avahi-0.6.20/avahi-ui/bssh.desktop.in
+--- avahi-0.6.22.orig/avahi-ui/bssh.desktop.in
++++ avahi-0.6.22/avahi-ui/bssh.desktop.in
 @@ -6,7 +6,8 @@ Comment=Browse for Zeroconf-enabled SSH 
  Exec=@bindir@/bssh
  Terminal=false
@@ -13,10 +13,10 @@ Index: avahi-0.6.20/avahi-ui/bssh.desktop.in
  StartupNotify=false
  GenericName=
 +X-SuSE-translate=true
-Index: avahi-0.6.20/avahi-ui/bvnc.desktop.in
+Index: avahi-0.6.22/avahi-ui/bvnc.desktop.in
 ===================================================================
---- avahi-0.6.20.orig/avahi-ui/bvnc.desktop.in
-+++ avahi-0.6.20/avahi-ui/bvnc.desktop.in
+--- avahi-0.6.22.orig/avahi-ui/bvnc.desktop.in
++++ avahi-0.6.22/avahi-ui/bvnc.desktop.in
 @@ -6,7 +6,8 @@ Comment=Browse for Zeroconf-enabled VNC 
  Exec=@bindir@/bvnc
  Terminal=false
@@ -28,10 +28,10 @@ Index: avahi-0.6.20/avahi-ui/bvnc.desktop.in
  StartupNotify=false
  GenericName=
 +X-SuSE-translate=true
-Index: avahi-0.6.20/avahi-python/avahi-discover.desktop.in
+Index: avahi-0.6.22/avahi-python/avahi-discover/avahi-discover.desktop.in
 ===================================================================
---- avahi-0.6.20.orig/avahi-python/avahi-discover.desktop.in
-+++ avahi-0.6.20/avahi-python/avahi-discover.desktop.in
+--- avahi-0.6.22.orig/avahi-python/avahi-discover/avahi-discover.desktop.in
++++ avahi-0.6.22/avahi-python/avahi-discover/avahi-discover.desktop.in
 @@ -6,7 +6,7 @@ Comment=Browse for Zeroconf services ava
  Exec=@bindir@/avahi-discover
  Terminal=false
diff --git a/avahi-empty-share-dir.patch b/avahi-empty-share-dir.patch
new file mode 100644
index 0000000..ae8c305
--- /dev/null
+++ b/avahi-empty-share-dir.patch
@@ -0,0 +1,12 @@
+Index: service-type-database/Makefile.am
+===================================================================
+--- service-type-database/Makefile.am.orig
++++ service-type-database/Makefile.am
+@@ -19,7 +19,6 @@
+ 
+ EXTRA_DIST=build-db.in service-types
+ 
+-pkgdata_DATA=service-types
+ pkglib_DATA=
+ 
+ if HAVE_PYTHON
diff --git a/avahi-gacdir.patch b/avahi-gacdir.patch
index cd7cf0a..f77cdda 100644
--- a/avahi-gacdir.patch
+++ b/avahi-gacdir.patch
@@ -31,7 +31,7 @@ Index: avahi-sharp/Makefile.in
 ===================================================================
 --- avahi-sharp/Makefile.in.orig
 +++ avahi-sharp/Makefile.in
-@@ -603,10 +603,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i
+@@ -669,10 +669,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i
  @HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@	$(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
  
  @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
@@ -48,7 +48,7 @@ Index: avahi-ui-sharp/Makefile.am
 ===================================================================
 --- avahi-ui-sharp/Makefile.am.orig
 +++ avahi-ui-sharp/Makefile.am
-@@ -61,10 +61,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
+@@ -62,10 +62,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
  endif
  
  install-data-hook: $(ASSEMBLY)
@@ -65,16 +65,16 @@ Index: avahi-ui-sharp/Makefile.in
 ===================================================================
 --- avahi-ui-sharp/Makefile.in.orig
 +++ avahi-ui-sharp/Makefile.in
-@@ -590,10 +590,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY)
- @HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@	$(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
+@@ -658,10 +658,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY)
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@	$(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
  
- @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
  
- @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
--@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
-+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
+ @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
+-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
++@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@	$(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
diff --git a/avahi-mono.spec b/avahi-mono.spec
index 52b7ed4..b756245 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package avahi-mono (Version 0.6.20)
+# spec file for package avahi-mono (Version 0.6.22)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@ Name:           avahi-mono
 %define _name avahi
 %define         build_mono 1
 # WARNING: Do not edit this auto generated file.
-Version:        0.6.20
-Release:        67
+Version:        0.6.22
+Release:        1
 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
 #%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
 %define avahi_client_soname 3
@@ -23,23 +23,31 @@ Release:        67
 %define avahi_core_soname 5
 %define avahi_ui_soname 0
 %define avahi_glib_soname 1
+%define avahi_gobject_soname 0
 %define avahi_qt3_soname 1
 %define avahi_qt4_soname 1
 Url:            http://www.avahi.org/
 Group:          Development/Languages/Mono
-License:        LGPL v2 or later
+License:        LGPL v2.1 or later
 Summary:        Mono Bindings for avahi, the D-BUS Service for Zeroconf and Bonjour
 Source:         %{_name}-%{version}.tar.bz2
 Source1:        gnome-nettool2.png
 Source2:        avahi-bookmarks.init
 Source3:        avahi.firewall
 Source4:        %{_name}_spec-prepare.sh
+#PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse
 Patch0:         avahi-gacdir.patch
+#PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de
 Patch1:         avahi-desktop.patch
+#PATCH-FIX-UPSTREAM avahi-init-lsb.patch -- committed after 0.6.22 release upstream
 Patch2:         avahi-init-lsb.patch
+#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
+Patch3:         avahi-empty-share-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel
+BuildRequires:  dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz intltool libdaemon-devel libglade2-devel update-desktop-files zlib-devel
 %if !%build_mono
+PreReq:         pwdutils
+Requires:       %{name}-lang = %{version}
 # For python bindings and utilities:
 BuildRequires:  dbus-1-python python-devel python-gdbm python-gtk-devel
 # For qt3 bindings
@@ -78,6 +86,7 @@ Authors:
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
 %if !%build_mono
+
 %package -n libavahi-client3
 Summary:        D-BUS Service for Zeroconf and Bonjour
 Group:          System/Libraries
@@ -203,6 +212,31 @@ correct mDNS reflection accross LAN segments.
 
 
 
+Authors:
+--------
+    Lennart Poettering <mztabzr@0pointer.de>
+    Trent Lloyd <lathiat@freedesktop.org>
+    Sebastien Estienne <sebastien.estienne@gmail.com>
+
+%package -n libavahi-gobject0
+Summary:        D-BUS Service for Zeroconf and Bonjour
+Group:          System/Daemons
+
+%description -n libavahi-gobject0
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing. It uses D-BUS for
+communication between user applications and a system daemon. The daemon
+is used to coordinate application efforts in caching replies, necessary
+to minimize the traffic imposed on networks.
+
+The Avahi mDNS responder is now complete with features, implementing
+all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs.
+It passes all tests in the Apple Bonjour conformance test suite. In
+addition, it supports some nifty things, like correct mDNS reflection
+across LAN segments.
+
+
+
 Authors:
 --------
     Lennart Poettering <mztabzr@0pointer.de>
@@ -393,6 +427,7 @@ Authors:
 
 %package -n python-avahi
 Summary:        A set of Avahi utilities written in Python
+PreReq:         coreutils
 Requires:       %{name} = %{version} python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web
 Group:          Development/Languages/Python
 # Old name used for <= 10.3:
@@ -475,6 +510,32 @@ correct mDNS reflection accross LAN segments.
 
 
 
+Authors:
+--------
+    Lennart Poettering <mztabzr@0pointer.de>
+    Trent Lloyd <lathiat@freedesktop.org>
+    Sebastien Estienne <sebastien.estienne@gmail.com>
+
+%package -n libavahi-gobject-devel
+Summary:        D-BUS Service for Zeroconf and Bonjour
+Requires:       libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel 
+Group:          System/Daemons
+
+%description -n libavahi-gobject-devel
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing. It uses D-BUS for
+communication between user applications and a system daemon. The daemon
+is used to coordinate application efforts in caching replies, necessary
+to minimize the traffic imposed on networks.
+
+The Avahi mDNS responder is now complete with features, implementing
+all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs.
+It passes all tests in the Apple Bonjour conformance test suite. In
+addition, it supports some nifty things, like correct mDNS reflection
+across LAN segments.
+
+
+
 Authors:
 --------
     Lennart Poettering <mztabzr@0pointer.de>
@@ -600,14 +661,19 @@ Authors:
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
 %endif
+%if !%build_mono
+%lang_package
+%endif
+
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0
 %patch1 -p1
 %patch2
+%patch3
 
 %build
-ACLOCAL="aclocal -I common" autoreconf -f -i
+autoreconf -f -i
 %configure\
 	--libexecdir=%{_prefix}/lib\
 	--disable-static\
@@ -632,10 +698,10 @@ ACLOCAL="aclocal -I common" autoreconf -f -i
 	--with-avahi-priv-access-group=avahi\
 	--with-autoipd-user=avahi\
 	--with-autoipd-group=avahi
-make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
 ## WARNING: found empty dependency_libs variable. please remove the
 ## pointless libtool .la file 
 ## /var/tmp/avahi-0.6.20-build/usr/lib64/lib\avahi-common.la
@@ -661,20 +727,22 @@ ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-b
 install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
 # FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
 %suse_update_desktop_file -r avahi-discover GNOME System Monitor 
+%find_lang %{name}
 %endif
 # Remove files if only building mono
 %if %build_mono
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-discover-standalone
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so.*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-browse*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-publish*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-resolve*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-set-host-name
+rm -rf $RPM_BUILD_ROOT%{_bindir}/bshell
 rm -rf $RPM_BUILD_ROOT%{_bindir}/bssh
 rm -rf $RPM_BUILD_ROOT%{_bindir}/bvnc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/avahi
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bssh.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bvnc.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-client*.so.*
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.so.*
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core*.so.*
@@ -696,13 +764,18 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core*.so
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.so
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.*a
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.so.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-ui*.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-ui*.*so
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-glib.pc
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-gobject.pc
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 %endif
 %fdupes $RPM_BUILD_ROOT%{_libdir}
@@ -781,6 +854,10 @@ fi
 
 %postun -n libavahi-qt4-1 -p /sbin/ldconfig
 
+%post -n libavahi-gobject0 -p /sbin/ldconfig
+
+%postun -n libavahi-gobject0 -p /sbin/ldconfig
+
 %post -n libavahi-glib1 -p /sbin/ldconfig
 
 %postun -n libavahi-glib1 -p /sbin/ldconfig
@@ -826,6 +903,10 @@ fi
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_sysconfdir}/init.d/avahi-dnsconfd
 %{_sysconfdir}/init.d/avahi-daemon
+%if !%build_mono
+
+%files lang -f %{name}.lang
+%endif
 
 %files -n libavahi-client3
 %defattr(-,root,root)
@@ -845,9 +926,12 @@ fi
 
 %files -n libavahi-glib1
 %defattr(-,root,root)
-%{_bindir}/avahi-discover-standalone
 %{_libdir}/libavahi-glib*.so.*
 
+%files -n libavahi-gobject0
+%defattr(-,root,root)
+%{_libdir}/libavahi-gobject*.so.*
+
 %files -n libavahi-qt3-1
 %defattr(-,root,root)
 %{_libdir}/libavahi-qt3*.so.*
@@ -872,9 +956,11 @@ fi
 %{_bindir}/avahi-publish*
 %{_bindir}/avahi-resolve*
 %{_bindir}/avahi-set-host-name
-%{_datadir}/avahi
-%{_datadir}/applications/bssh.desktop
-%{_datadir}/applications/bvnc.desktop
+%dir %{_datadir}/avahi/
+%{_datadir}/avahi/avahi-service.dtd
+%{_datadir}/avahi/introspection
+%dir %{_libdir}/avahi/
+%{_libdir}/avahi/service-types.db
 %{_datadir}/pixmaps/gnome-nettool2.png
 %doc %{_mandir}/man1/avahi-browse*.1*
 %doc %{_mandir}/man1/avahi-publish*.1*
@@ -883,14 +969,21 @@ fi
 
 %files utils-gtk
 %defattr(-,root,root)
+%{_bindir}/bshell
 %{_bindir}/bssh
 %{_bindir}/bvnc
+%{_bindir}/avahi-discover-standalone
+%{_datadir}/applications/bssh.desktop
+%{_datadir}/applications/bvnc.desktop
+%dir %{_datadir}/avahi/
+%{_datadir}/avahi/interfaces
 %doc %{_mandir}/man1/bssh.1.*
 %doc %{_mandir}/man1/bvnc.1.*
 
 %files -n python-avahi
 %defattr(-,root,root)
 %{py_sitedir}/avahi
+%{py_sitedir}/avahi_discover
 %{_bindir}/avahi-discover
 %{_bindir}/avahi-bookmarks
 %doc %{_mandir}/man1/avahi-bookmarks.1*
@@ -928,6 +1021,13 @@ fi
 %{_libdir}/pkgconfig/avahi-glib.pc
 %{_libdir}/pkgconfig/avahi-ui.pc
 
+%files -n libavahi-gobject-devel
+%defattr(-,root,root)
+%{_includedir}/avahi-gobject
+%{_libdir}/libavahi-gobject*.*a
+%{_libdir}/libavahi-gobject*.so
+%{_libdir}/pkgconfig/avahi-gobject.pc
+
 %files -n libavahi-qt3-devel
 %defattr(-,root,root)
 %{_includedir}/avahi-qt3
@@ -957,6 +1057,7 @@ fi
 %{_libdir}/pkgconfig/avahi-compat-howl.pc
 %{_libdir}/pkgconfig/howl.pc
 %endif
+
 %changelog
 * Thu Oct 11 2007 - sbrabec@suse.de
 - Updated dependencies.
diff --git a/avahi.changes b/avahi.changes
index 411342f..10a746d 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Wed Dec 19 16:33:02 CET 2007 - jpr@suse.de
+
+- Update to 0.6.22
+    * i18n support
+    * Documentation and example code updates
+    * Support for registering the Avahi documentation in devhelp
+      (needs manual setup)
+    * Added a new component libavahi-gobject, which is a 
+      GObjectified version of the Avahi API
+    * Major BSD compatibility improvements
+    * avahi-ui: Allow overwriting of pretty service name by the
+      application
+    * Service type database updates
+    * Add new option --parsable to avahi-browse
+    * Make avahi-autoipd actually produce correct ARP packets
+    * Add FreeBSD kqueue support for watching /etc/avahi/services
+    * Use search domain from /etc/resolv.conf as additional browse
+      domains.
+    * No longer return a conflict error when two local applications 
+      register identical RRs.
+    * Properly find alternative service/host names for very long names
+    * DNS name compression fix (Sjoerd Simons)
+    * Fedora init script order fix
+    * Several fixes to make gcc produces less warnings
+    * Minor other updates 
+- Package avahi-discover-standalone in gtk-utils with its glade files
+
 -------------------------------------------------------------------
 Sun Oct 21 14:20:02 CEST 2007 - coolo@suse.de
 
diff --git a/avahi.spec b/avahi.spec
index df3ff6c..9ee5f34 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package avahi (Version 0.6.20)
+# spec file for package avahi (Version 0.6.22)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@ Name:           avahi
 %define _name avahi
 %define         build_mono 0
 # WARNING: After editing this file please call Re or rpmbuild to update spec files:
-Version:        0.6.20
-Release:        52
+Version:        0.6.22
+Release:        1
 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
 #%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
 %define avahi_client_soname 3
@@ -23,23 +23,31 @@ Release:        52
 %define avahi_core_soname 5
 %define avahi_ui_soname 0
 %define avahi_glib_soname 1
+%define avahi_gobject_soname 0
 %define avahi_qt3_soname 1
 %define avahi_qt4_soname 1
 Url:            http://www.avahi.org/
 Group:          System/Daemons
-License:        LGPL v2 or later
+License:        LGPL v2.1 or later
 Summary:        D-BUS Service for Zeroconf and Bonjour
 Source:         %{_name}-%{version}.tar.bz2
 Source1:        gnome-nettool2.png
 Source2:        avahi-bookmarks.init
 Source3:        avahi.firewall
 Source4:        %{_name}_spec-prepare.sh
+#PATCH-FIX-OPENSUSE avahi-gacdir.patch -- Mono libs are in $prefix/lib on suse
 Patch0:         avahi-gacdir.patch
+#PATCH-FIX-UPSTREAM avahi-desktop.patch bnc254654 sbrabec@suse.de
 Patch1:         avahi-desktop.patch
+#PATCH-FIX-UPSTREAM avahi-init-lsb.patch -- committed after 0.6.22 release upstream
 Patch2:         avahi-init-lsb.patch
+#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
+Patch3:         avahi-empty-share-dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz libdaemon-devel libglade2-devel update-desktop-files zlib-devel
+BuildRequires:  dbus-1-devel doxygen fdupes gcc-c++ gdbm-devel graphviz intltool libdaemon-devel libglade2-devel update-desktop-files zlib-devel
 %if !%build_mono
+PreReq:         pwdutils
+Requires:       %{name}-lang = %{version}
 # For python bindings and utilities:
 BuildRequires:  dbus-1-python python-devel python-gdbm python-gtk-devel
 # For qt3 bindings
@@ -79,6 +87,7 @@ Authors:
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
 %if !%build_mono
+
 %package -n libavahi-client3
 Summary:        D-BUS Service for Zeroconf and Bonjour
 Group:          System/Libraries
@@ -204,6 +213,31 @@ correct mDNS reflection accross LAN segments.
 
 
 
+Authors:
+--------
+    Lennart Poettering <mztabzr@0pointer.de>
+    Trent Lloyd <lathiat@freedesktop.org>
+    Sebastien Estienne <sebastien.estienne@gmail.com>
+
+%package -n libavahi-gobject0
+Summary:        D-BUS Service for Zeroconf and Bonjour
+Group:          System/Daemons
+
+%description -n libavahi-gobject0
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing. It uses D-BUS for
+communication between user applications and a system daemon. The daemon
+is used to coordinate application efforts in caching replies, necessary
+to minimize the traffic imposed on networks.
+
+The Avahi mDNS responder is now complete with features, implementing
+all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs.
+It passes all tests in the Apple Bonjour conformance test suite. In
+addition, it supports some nifty things, like correct mDNS reflection
+across LAN segments.
+
+
+
 Authors:
 --------
     Lennart Poettering <mztabzr@0pointer.de>
@@ -394,6 +428,7 @@ Authors:
 
 %package -n python-avahi
 Summary:        A set of Avahi utilities written in Python
+PreReq:         coreutils
 Requires:       %{name} = %{version} python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web
 Group:          Development/Languages/Python
 # Old name used for <= 10.3:
@@ -476,6 +511,32 @@ correct mDNS reflection accross LAN segments.
 
 
 
+Authors:
+--------
+    Lennart Poettering <mztabzr@0pointer.de>
+    Trent Lloyd <lathiat@freedesktop.org>
+    Sebastien Estienne <sebastien.estienne@gmail.com>
+
+%package -n libavahi-gobject-devel
+Summary:        D-BUS Service for Zeroconf and Bonjour
+Requires:       libavahi-devel = %{version} libavahi-glib-devel libavahi-gobject0 = %{version} glib2-devel 
+Group:          System/Daemons
+
+%description -n libavahi-gobject-devel
+Avahi is an implementation of the DNS Service Discovery and Multicast
+DNS specifications for Zeroconf Computing. It uses D-BUS for
+communication between user applications and a system daemon. The daemon
+is used to coordinate application efforts in caching replies, necessary
+to minimize the traffic imposed on networks.
+
+The Avahi mDNS responder is now complete with features, implementing
+all MUSTs and the majority of the SHOULDs of the mDNS and DNS-SD RFCs.
+It passes all tests in the Apple Bonjour conformance test suite. In
+addition, it supports some nifty things, like correct mDNS reflection
+across LAN segments.
+
+
+
 Authors:
 --------
     Lennart Poettering <mztabzr@0pointer.de>
@@ -601,14 +662,19 @@ Authors:
     Sebastien Estienne <sebastien.estienne@gmail.com>
 
 %endif
+%if !%build_mono
+%lang_package
+%endif
+
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0
 %patch1 -p1
 %patch2
+%patch3
 
 %build
-ACLOCAL="aclocal -I common" autoreconf -f -i
+autoreconf -f -i
 %configure\
 	--libexecdir=%{_prefix}/lib\
 	--disable-static\
@@ -633,10 +699,10 @@ ACLOCAL="aclocal -I common" autoreconf -f -i
 	--with-avahi-priv-access-group=avahi\
 	--with-autoipd-user=avahi\
 	--with-autoipd-group=avahi
-make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
 ## WARNING: found empty dependency_libs variable. please remove the
 ## pointless libtool .la file 
 ## /var/tmp/avahi-0.6.20-build/usr/lib64/lib\avahi-common.la
@@ -662,20 +728,22 @@ ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-b
 install -m 644 %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/avahi
 # FIXME: There are no better Categories in the spec (Monitor is not allowed in Network).
 %suse_update_desktop_file -r avahi-discover GNOME System Monitor 
+%find_lang %{name}
 %endif
 # Remove files if only building mono
 %if %build_mono
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-discover-standalone
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so.*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-browse*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-publish*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-resolve*
 rm -rf $RPM_BUILD_ROOT%{_bindir}/avahi-set-host-name
+rm -rf $RPM_BUILD_ROOT%{_bindir}/bshell
 rm -rf $RPM_BUILD_ROOT%{_bindir}/bssh
 rm -rf $RPM_BUILD_ROOT%{_bindir}/bvnc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/avahi
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bssh.desktop
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bvnc.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-client*.so.*
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.so.*
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core*.so.*
@@ -697,13 +765,18 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-core*.so
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.so
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-common*.*a
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.so.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-glib*.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.so.*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-gobject*.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-ui*.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libavahi-ui*.*so
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-client.pc
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-core.pc
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-glib.pc
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-gobject.pc
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 %endif
 %fdupes $RPM_BUILD_ROOT%{_libdir}
@@ -782,6 +855,10 @@ fi
 
 %postun -n libavahi-qt4-1 -p /sbin/ldconfig
 
+%post -n libavahi-gobject0 -p /sbin/ldconfig
+
+%postun -n libavahi-gobject0 -p /sbin/ldconfig
+
 %post -n libavahi-glib1 -p /sbin/ldconfig
 
 %postun -n libavahi-glib1 -p /sbin/ldconfig
@@ -827,6 +904,10 @@ fi
 %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_sysconfdir}/init.d/avahi-dnsconfd
 %{_sysconfdir}/init.d/avahi-daemon
+%if !%build_mono
+
+%files lang -f %{name}.lang
+%endif
 
 %files -n libavahi-client3
 %defattr(-,root,root)
@@ -846,9 +927,12 @@ fi
 
 %files -n libavahi-glib1
 %defattr(-,root,root)
-%{_bindir}/avahi-discover-standalone
 %{_libdir}/libavahi-glib*.so.*
 
+%files -n libavahi-gobject0
+%defattr(-,root,root)
+%{_libdir}/libavahi-gobject*.so.*
+
 %files -n libavahi-qt3-1
 %defattr(-,root,root)
 %{_libdir}/libavahi-qt3*.so.*
@@ -873,9 +957,11 @@ fi
 %{_bindir}/avahi-publish*
 %{_bindir}/avahi-resolve*
 %{_bindir}/avahi-set-host-name
-%{_datadir}/avahi
-%{_datadir}/applications/bssh.desktop
-%{_datadir}/applications/bvnc.desktop
+%dir %{_datadir}/avahi/
+%{_datadir}/avahi/avahi-service.dtd
+%{_datadir}/avahi/introspection
+%dir %{_libdir}/avahi/
+%{_libdir}/avahi/service-types.db
 %{_datadir}/pixmaps/gnome-nettool2.png
 %doc %{_mandir}/man1/avahi-browse*.1*
 %doc %{_mandir}/man1/avahi-publish*.1*
@@ -884,14 +970,21 @@ fi
 
 %files utils-gtk
 %defattr(-,root,root)
+%{_bindir}/bshell
 %{_bindir}/bssh
 %{_bindir}/bvnc
+%{_bindir}/avahi-discover-standalone
+%{_datadir}/applications/bssh.desktop
+%{_datadir}/applications/bvnc.desktop
+%dir %{_datadir}/avahi/
+%{_datadir}/avahi/interfaces
 %doc %{_mandir}/man1/bssh.1.*
 %doc %{_mandir}/man1/bvnc.1.*
 
 %files -n python-avahi
 %defattr(-,root,root)
 %{py_sitedir}/avahi
+%{py_sitedir}/avahi_discover
 %{_bindir}/avahi-discover
 %{_bindir}/avahi-bookmarks
 %doc %{_mandir}/man1/avahi-bookmarks.1*
@@ -929,6 +1022,13 @@ fi
 %{_libdir}/pkgconfig/avahi-glib.pc
 %{_libdir}/pkgconfig/avahi-ui.pc
 
+%files -n libavahi-gobject-devel
+%defattr(-,root,root)
+%{_includedir}/avahi-gobject
+%{_libdir}/libavahi-gobject*.*a
+%{_libdir}/libavahi-gobject*.so
+%{_libdir}/pkgconfig/avahi-gobject.pc
+
 %files -n libavahi-qt3-devel
 %defattr(-,root,root)
 %{_includedir}/avahi-qt3
@@ -958,7 +1058,33 @@ fi
 %{_libdir}/pkgconfig/avahi-compat-howl.pc
 %{_libdir}/pkgconfig/howl.pc
 %endif
+
 %changelog
+* Wed Dec 19 2007 - jpr@suse.de
+- Update to 0.6.22
+  * i18n support
+  * Documentation and example code updates
+  * Support for registering the Avahi documentation in devhelp
+  (needs manual setup)
+  * Added a new component libavahi-gobject, which is a
+  GObjectified version of the Avahi API
+  * Major BSD compatibility improvements
+  * avahi-ui: Allow overwriting of pretty service name by the
+  application
+  * Service type database updates
+  * Add new option --parsable to avahi-browse
+  * Make avahi-autoipd actually produce correct ARP packets
+  * Add FreeBSD kqueue support for watching /etc/avahi/services
+  * Use search domain from /etc/resolv.conf as additional browse
+  domains.
+  * No longer return a conflict error when two local applications
+  register identical RRs.
+  * Properly find alternative service/host names for very long names
+  * DNS name compression fix (Sjoerd Simons)
+  * Fedora init script order fix
+  * Several fixes to make gcc produces less warnings
+  * Minor other updates
+- Package avahi-discover-standalone in gtk-utils with its glade files
 * Sun Oct 21 2007 - coolo@suse.de
 - fix provides, obsoleting something another package provides creates
   a conflict between them
diff --git a/avahi_spec-prepare.sh b/avahi_spec-prepare.sh
index b2bdcca..8071c94 100644
--- a/avahi_spec-prepare.sh
+++ b/avahi_spec-prepare.sh
@@ -12,7 +12,7 @@ if ! test -f $1/$ORIG_SPEC.spec ; then
     exit
 fi
 
-for PKGNAME in avahi-client avahi-common avahi-core avahi-ui avahi-glib avahi-qt3 avahi-qt4 ; do
+for PKGNAME in avahi-client avahi-common avahi-core avahi-ui avahi-glib avahi-gobject avahi-qt3 avahi-qt4 ; do
     # Packages with name ending by number needs separator
     if test x`echo $PKGNAME | sed "s/.*[0-9]$//"` = x ; then
 	SEPARATOR=-