diff --git a/avahi-remove-netdev.patch b/avahi-remove-netdev.patch
deleted file mode 100644
index 8a86830..0000000
--- a/avahi-remove-netdev.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- avahi-daemon/avahi-dbus.conf	2007-02-22 15:19:01.000000000 -0500
-+++ avahi-daemon/avahi-dbus.conf	2007-02-22 16:12:21.000000000 -0500
-@@ -19,8 +19,8 @@
-     <deny send_interface="org.freedesktop.Avahi.Server" send_member="SetHostName"/>
-   </policy>
- 
--  <!-- Allow everything, including access to SetHostName to users of the group "netdev" -->
--  <policy group="netdev">
-+  <!-- Allow everything, including access to SetHostName to users of the group "avahi" -->
-+  <policy group="avahi">
-     <allow send_destination="org.freedesktop.Avahi"/>
-     <allow receive_sender="org.freedesktop.Avahi"/>
-   </policy>
diff --git a/avahi.changes b/avahi.changes
index f525d62..a6bb196 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 27 17:45:31 CET 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
+  and user.  This fixes 237145. 
+
 -------------------------------------------------------------------
 Mon Feb 26 18:27:52 CET 2007 - crivera@suse.de
 
diff --git a/avahi.spec b/avahi.spec
index 39905ba..f7fc393 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:        2
+Release:        4
 URL:            http://www.avahi.org/
 Group:          System/Daemons
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
@@ -30,7 +30,6 @@ Source3:        avahi.firewall
 Patch:          avahi-gacdir.patch
 Patch2:         avahi-discover-icon.patch
 Patch3:         avahi-python-compile.patch
-Patch4:         avahi-remove-netdev.patch
 # See also http://www.avahi.org/wiki/DownloadAvahi#RequirementsTable
 Requires:       dbus-1 python python-gdbm python-gtk dbus-1-python python-twisted python-twisted-web
 # Not really required, but many tools expect nss-mdns installed:
@@ -346,7 +345,6 @@ Authors:
 %patch
 %patch2
 %patch3
-%patch4
 
 %build
 ACLOCAL="aclocal -I common" autoreconf -f -i
@@ -360,7 +358,10 @@ ACLOCAL="aclocal -I common" autoreconf -f -i
         --enable-python\
         --enable-pygtk\
 	--enable-compat-libdns_sd\
-	--enable-compat-howl
+	--enable-compat-howl\
+	--with-avahi-priv-access-group=avahi\
+	--with-autoipd-user=avahi\
+	--with-autoipd-group=avahi
 make %{?jobs:-j%jobs}
 
 %install
@@ -506,6 +507,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/avahi-qt4.pc
 
 %changelog
+* 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
+  and user.  This fixes 237145.
 * Mon Feb 26 2007 - crivera@suse.de
 - Replace the non-existent "netdev" group with the "avahi" group in
   avahi-dbus.conf.  This fixes 237145.