diff --git a/.cvsignore b/.cvsignore
index cbc7b28..f83ffe9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,4 @@ avahi-0.6.6.tar.gz
 avahi-0.6.7.tar.gz
 avahi-0.6.8.tar.gz
 avahi-0.6.9.tar.gz
+avahi-0.6.10.tar.gz
diff --git a/avahi.spec b/avahi.spec
index 71922e5..9c47c2b 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,10 +1,12 @@
 %{?!WITH_MONO:  %define WITH_MONO 1}
+%{?!WITH_COMPAT_DNSSD:  %define WITH_COMPAT_DNSSD 1}
+%{?!WITH_COMPAT_HOWL:   %define WITH_COMPAT_HOWL  1}
 %ifarch ppc64
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.9
-Release: 	9.FC6
+Version:        0.6.10
+Release: 	1.FC6
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -16,7 +18,7 @@ BuildRequires: mono-devel >= 1.1.13
 %endif
 Requires:       dbus, libdaemon, expat, python, dbus-python, libcap
 Requires(post): initscripts, chkconfig, ldconfig
-Obsoletes:	howl, howl-libs
+Obsoletes:	howl
 Source0:        %{name}-%{version}.tar.gz
 Patch1:		avahi-0.5.2-fedora.patch
 Patch2:		avahi-0.5.2-start_after_dbus.patch
@@ -106,15 +108,48 @@ mono programs that use avahi.
 %endif
 
 %package devel
-Summary: Libraries and header files for avahi development
-Group: Development/Libraries
+Summary:  Libraries and header files for avahi development
+Group:    Development/Libraries
 Requires: %{name} = %{version}
-Obsoletes: howl-devel
 
 %description devel
 The avahi-devel package contains the header files and libraries
 necessary for developing programs using avahi.
 
+%package   compat-howl
+Summary:   Libraries for howl compatibility.
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+Obsoletes: howl-libs
+
+%description compat-howl
+Libraries that are compatible with those provided by the howl package. 
+
+%package   compat-howl-devel
+Summary:   Header files for development with the howl compatibility libraries.
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+Obsoletes: howl-devel
+
+%description compat-howl-devel
+Header files for development with the howl compatibility libraries.
+
+%package   compat-libdns_sd
+Summary:   Libraries for Apple Bonjour mDNSResponder compatibility.
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+
+%description compat-libdns_sd
+Libraries for Apple Bonjour mDNSResponder compatibility.
+
+%package   compat-libdns_sd-devel
+Summary:   Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+
+%description compat-libdns_sd-devel
+Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
+
 %define avahi_user_uid 70
 
 %prep
@@ -146,7 +181,8 @@ necessary for developing programs using avahi.
 %patch13 -p1 -b .bz185972
 %patch14 -p1 -b .bz189427
 %patch15 -p1 -b .mono-libdir
-%patch16 -p1 -b .sharp-lock
+#%patch16 -p1 -b .sharp-lock
+#^- this patch now upstream
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -155,7 +191,10 @@ libtoolize --force
 automake-1.9 --add-missing
 autoconf
 
-%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd \
+%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl \
+%if %{WITH_COMPAT_DNSSD}
+	--enable-compat-libdns_sd \
+%endif
 %if ! %{WITH_MONO}
 	--disable-mono \
 %endif
@@ -264,8 +303,6 @@ fi
 %attr(755,root,root) %{_libdir}/libavahi-common.so.*
 %attr(755,root,root) %{_libdir}/libavahi-core.so.*
 %attr(755,root,root) %{_libdir}/libavahi-client.so.*
-%attr(755,root,root) %{_libdir}/libhowl.so.*
-%attr(755,root,root) %{_libdir}/libdns_sd.so.*
 %attr(755,root,root) %{_datadir}/avahi
 %exclude %{_datadir}/avahi/interfaces
 %exclude %{_datadir}/avahi/service-types*
@@ -286,17 +323,11 @@ fi
 %attr(755,root,root) %{_libdir}/libavahi-common.so
 %attr(755,root,root) %{_libdir}/libavahi-core.so
 %attr(755,root,root) %{_libdir}/libavahi-client.so
-%attr(755,root,root) %{_libdir}/libhowl.so
-%attr(755,root,root) %{_libdir}/libdns_sd.so
 %{_includedir}/avahi-client
 %{_includedir}/avahi-common
 %{_includedir}/avahi-core
-%{_includedir}/avahi-compat-howl
-%{_includedir}/avahi-compat-libdns_sd
 %{_libdir}/pkgconfig/avahi-core.pc
 %{_libdir}/pkgconfig/avahi-client.pc
-%{_libdir}/pkgconfig/avahi-compat-howl.pc
-%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
 
 %files glib
 %defattr(0755, root, root, 0755)
@@ -326,7 +357,36 @@ fi
 %{_libdir}/pkgconfig/avahi-sharp.pc
 %endif
 
+%if %{WITH_COMPAT_HOWL}
+%files compat-howl
+%defattr(0755, root, root, 0755)
+%{_libdir}/libhowl.so.*
+
+%files compat-howl-devel
+%defattr(0644, root, root, 0755)
+%attr(755,root,root) %{_libdir}/libhowl.so
+%{_includedir}/avahi-compat-howl
+%{_libdir}/pkgconfig/avahi-compat-howl.pc
+%endif
+
+%if %{WITH_COMPAT_DNSSD}
+%files compat-libdns_sd
+%defattr(0755, root, root, 0755)
+%{_libdir}/libdns_sd.so.*
+
+%files compat-libdns_sd-devel
+%defattr(0644, root, root, 0755)
+%attr(755,root,root) %{_libdir}/libdns_sd.so
+%{_includedir}/avahi-compat-libdns_sd
+%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
+%endif
+
 %changelog
+* Tue May 30 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.10-1.FC6
+- Upgrade to upstream version 0.6.10
+- fix bug 192080: split avahi-compat-libdns_sd into separate package
+                  (same goes for avahi-compat-howl)
+
 * Tue May 02 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.9-9.FC6
 - fix avahi-sharp issues for banshee - patches from caillon@redhat.com
 
diff --git a/sources b/sources
index bebe7d0..787ad30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2652910f0e52c373d7a15b6851750517  avahi-0.6.9.tar.gz
+cfb9e05c138dff4c430a35eee6229e8a  avahi-0.6.10.tar.gz