diff --git a/avahi.changes b/avahi.changes
index a6bb196..77b60ff 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar  9 23:10:02 CET 2007 - crivera@suse.de
+
+- Install avahi.firewill in /etc/sysconfig/SuSEfirewall2.d/services
+  instead of /usr/share/SuSEfirewall2/services.  This allows avahi
+  to build again.  This also depends on the latest dbus-1-python
+  submission being approved. 
+
 -------------------------------------------------------------------
 Tue Feb 27 17:45:31 CET 2007 - crivera@suse.de
 
diff --git a/avahi.spec b/avahi.spec
index f7fc393..a18716b 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -18,7 +18,7 @@ BuildRequires:  libqt4-devel python-gtk-devel
 BuildRequires:  python-gtk qt-devel
 %endif
 Version:        0.6.17
-Release:        4
+Release:        6
 URL:            http://www.avahi.org/
 Group:          System/Daemons
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
@@ -376,12 +376,12 @@ ln -s avahi-compat-howl.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/howl.pc
 %if %suse_version <= 1020
 sed -i "s,$RPM_BUILD_DIR,/," $RPM_BUILD_ROOT%{_libdir}/libavahi-qt4.la
 %endif
-mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_datadir}/SuSEfirewall2/services
+mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 install %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/avahi-bookmarks
 ln -s %{_sysconfdir}/init.d/avahi-daemon $RPM_BUILD_ROOT%{_sbindir}/rcavahi-daemon
 ln -s %{_sysconfdir}/init.d/avahi-dnsconfd $RPM_BUILD_ROOT%{_sbindir}/rcavahi-dnsconfd
 ln -s %{_sysconfdir}/init.d/avahi-bookmarks $RPM_BUILD_ROOT%{_sbindir}/rcavahi-bookmarks
-install %{S:3} $RPM_BUILD_ROOT%{_datadir}/SuSEfirewall2/services/avahi
+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 
 
@@ -412,7 +412,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/avahi-set-host-name
 %{_datadir}/avahi
 %{_datadir}/pixmaps/gnome-nettool2.png
-%{_datadir}/SuSEfirewall2/services/*
+%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/*
 %{_libdir}/*avahi-client*.so.*
 %{_libdir}/*avahi-common*.so.*
 %{_libdir}/*avahi-core*.so.*
@@ -507,6 +507,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/avahi-qt4.pc
 
 %changelog
+* Fri Mar 09 2007 - crivera@suse.de
+- Install avahi.firewill in /etc/sysconfig/SuSEfirewall2.d/services
+  instead of /usr/share/SuSEfirewall2/services.  This allows avahi
+  to build again.  This also depends on the latest dbus-1-python
+  submission being approved.
 * Tue Feb 27 2007 - crivera@suse.de
 - Remove netdev patch in favor of using the configure parameter
   instead.  This also fixes a similar issue with the autoipd group