diff --git a/avahi-mono.spec b/avahi-mono.spec
index 99eb759..b451931 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -16,7 +16,7 @@ Name:           avahi-mono
 # avahi.spec and then run pre_checkin.sh which will create
 # avahi-mono.spec based upon avahi.spec.
 Version:        0.6.20
-Release:        22
+Release:        39
 URL:            http://www.avahi.org/
 Group:          Development/Libraries/Other
 License:        LGPL v2 or later
@@ -459,17 +459,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
 %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
 
+%post
+/sbin/ldconfig
+%{fillup_and_insserv -f -Y avahi-daemon}
+%{fillup_and_insserv -f -Y avahi-dnsconfd}
+
 %preun
 %{stop_on_removal avahi-daemon}
 %{stop_on_removal avahi-dnsconfd}
 
-%post
-/sbin/ldconfig
-
 %postun
+/sbin/ldconfig
 %{restart_on_update avahi-daemon}
 %{restart_on_update avahi-dnsconfd}
-/sbin/ldconfig
+%insserv_cleanup
+
+%preun python
+%{stop_on_removal avahi-bookmarks}
+%insserv_cleanup
+
+%postun python
+%{restart_on_update avahi-bookmarks}
 %insserv_cleanup
 
 %post -n avahi-qt3
@@ -528,6 +538,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/avahi
 %{_datadir}/applications/bssh.desktop
 %{_datadir}/applications/bvnc.desktop
+%{_datadir}/pixmaps/gnome-nettool2.png
 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/*
 %{_libdir}/*avahi-client*.so.*
 %{_libdir}/*avahi-common*.so.*
@@ -569,7 +580,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/avahi-bookmarks.1*
 %doc %{_mandir}/man1/avahi-discover.1*
 %{_datadir}/applications/avahi-discover.desktop
-%{_datadir}/pixmaps/gnome-nettool2.png
 %{_sbindir}/rcavahi-bookmarks
 %{_sysconfdir}/init.d/avahi-bookmarks
 
diff --git a/avahi.changes b/avahi.changes
index 1b6998e..e4c338b 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep  5 23:22:37 CEST 2007 - maw@suse.de
+
+- Move %{_datadir}/pixmaps/gnome-nettool2.png from the python
+  subpackage to the base package (#299566).
+
+-------------------------------------------------------------------
+Wed Sep  5 12:44:12 CEST 2007 - sbrabec@suse.cz
+
+- Start avahi by default (#298872).
+- Handle avahi-bookmarks daemon in scriptlets.
+
 -------------------------------------------------------------------
 Tue Aug  7 18:31:53 CEST 2007 - maw@suse.de
 
diff --git a/avahi.spec b/avahi.spec
index c1ccb96..a211eae 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -16,7 +16,7 @@ Name:           avahi
 # avahi.spec and then run pre_checkin.sh which will create
 # avahi-mono.spec based upon avahi.spec.
 Version:        0.6.20
-Release:        22
+Release:        34
 URL:            http://www.avahi.org/
 Group:          System/Daemons
 License:        LGPL v2 or later
@@ -460,17 +460,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
 %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
 
+%post
+/sbin/ldconfig
+%{fillup_and_insserv -f -Y avahi-daemon}
+%{fillup_and_insserv -f -Y avahi-dnsconfd}
+
 %preun
 %{stop_on_removal avahi-daemon}
 %{stop_on_removal avahi-dnsconfd}
 
-%post
-/sbin/ldconfig
-
 %postun
+/sbin/ldconfig
 %{restart_on_update avahi-daemon}
 %{restart_on_update avahi-dnsconfd}
-/sbin/ldconfig
+%insserv_cleanup
+
+%preun python
+%{stop_on_removal avahi-bookmarks}
+%insserv_cleanup
+
+%postun python
+%{restart_on_update avahi-bookmarks}
 %insserv_cleanup
 
 %post -n avahi-qt3
@@ -529,6 +539,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/avahi
 %{_datadir}/applications/bssh.desktop
 %{_datadir}/applications/bvnc.desktop
+%{_datadir}/pixmaps/gnome-nettool2.png
 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/*
 %{_libdir}/*avahi-client*.so.*
 %{_libdir}/*avahi-common*.so.*
@@ -570,7 +581,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/avahi-bookmarks.1*
 %doc %{_mandir}/man1/avahi-discover.1*
 %{_datadir}/applications/avahi-discover.desktop
-%{_datadir}/pixmaps/gnome-nettool2.png
 %{_sbindir}/rcavahi-bookmarks
 %{_sysconfdir}/init.d/avahi-bookmarks
 
@@ -643,6 +653,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Sep 05 2007 - maw@suse.de
+- Move %%{_datadir}/pixmaps/gnome-nettool2.png from the python
+  subpackage to the base package (#299566).
+* Wed Sep 05 2007 - sbrabec@suse.cz
+- Start avahi by default (#298872).
+- Handle avahi-bookmarks daemon in scriptlets.
 * Tue Aug 07 2007 - maw@suse.de
 - But that macro is deprecated (http://en.opensuse.org/Packaging/SUSE_Package_Conventions/RPM_Macros#3.28._.25run_ldconfig_.28deprecated.29)
   so replace it with /sbin/ldconfig.