diff --git a/packages/network/avahi/build b/packages/network/avahi/build
index 355e2d81b4..37529b5986 100755
--- a/packages/network/avahi/build
+++ b/packages/network/avahi/build
@@ -7,11 +7,6 @@ $SCRIPTS/build expat
 $SCRIPTS/build gettext
 $SCRIPTS/build libdaemon
 $SCRIPTS/build dbus
-$SCRIPTS/build Python
-$SCRIPTS/build dbus-python
-$SCRIPTS/build pygtk
-
-. config/options.python
 
 cd $PKG_BUILD
 
@@ -36,9 +31,9 @@ py_cv_mod_dbus_=yes \
             --disable-dbm \
             --disable-gdbm \
             --enable-libdaemon \
-            --enable-python \
-            --enable-pygtk \
-            --enable-python-dbus \
+            --disable-python \
+            --disable-pygtk \
+            --disable-python-dbus \
             --disable-mono \
             --disable-monodoc \
             --enable-autoipd \
@@ -67,5 +62,3 @@ py_cv_mod_dbus_=yes \
 make
 
 $MAKEINSTALL
-
-$PYTHON -Wi -t $PYTHON_LIBDIR/compileall.py avahi-python/avahi
diff --git a/packages/network/avahi/install b/packages/network/avahi/install
index 11bfa65558..cc82909340 100755
--- a/packages/network/avahi/install
+++ b/packages/network/avahi/install
@@ -6,12 +6,6 @@ $SCRIPTS/install expat
 $SCRIPTS/install libdaemon
 $SCRIPTS/install gettext
 $SCRIPTS/install dbus
-$SCRIPTS/install Python
-$SCRIPTS/install dbus-python
-$SCRIPTS/install pygtk
-
-PKG_DIR=`find $PACKAGES -type d -name $1`
-PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*`
 
 add_user avahi x 495 495 "avahi-daemon" "/var/run/avahi-daemon" "/bin/sh"
 add_user avahi-autoipd x 496 496 "avahi-autoipd" "/var/lib/avahi-autoipd" "/bin/sh"
@@ -19,44 +13,41 @@ add_group avahi 495
 add_group avahiautoipd 496
 
 mkdir -p $INSTALL/usr/sbin
-cp -PR $PKG_BUILD/avahi-autoipd/avahi-autoipd $INSTALL/usr/sbin
-cp -PR $PKG_BUILD/avahi-daemon/.libs/avahi-daemon $INSTALL/usr/sbin
-cp -PR $PKG_BUILD/avahi-dnsconfd/.libs/avahi-dnsconfd $INSTALL/usr/sbin
+  cp -PR $PKG_BUILD/avahi-autoipd/avahi-autoipd $INSTALL/usr/sbin
+  cp -PR $PKG_BUILD/avahi-daemon/.libs/avahi-daemon $INSTALL/usr/sbin
+  cp -PR $PKG_BUILD/avahi-dnsconfd/.libs/avahi-dnsconfd $INSTALL/usr/sbin
 
 mkdir -p $INSTALL/usr/lib
-cp -PR $PKG_BUILD/avahi-common/.libs/*.so* $INSTALL/usr/lib/
-cp -PR $PKG_BUILD/avahi-core/.libs/*.so* $INSTALL/usr/lib/
-rm -rf $INSTALL/usr/lib/libavahi*.so*T
+  cp -PR $PKG_BUILD/avahi-common/.libs/*.so*[.0-9] $INSTALL/usr/lib/
+  cp -PR $PKG_BUILD/avahi-core/.libs/*.so*[.0-9] $INSTALL/usr/lib/
+  cp -PR $PKG_BUILD/avahi-client/.libs/*.so*[.0-9] $INSTALL/usr/lib/
 
 mkdir -p $INSTALL/etc/avahi
-cp -PR $PKG_BUILD/avahi-autoipd/avahi-autoipd.action $INSTALL/etc/avahi
-cp -PR $PKG_BUILD/avahi-daemon/avahi-daemon.conf $INSTALL/etc/avahi
+  cp -PR $PKG_BUILD/avahi-autoipd/avahi-autoipd.action $INSTALL/etc/avahi
+  cp -PR $PKG_BUILD/avahi-daemon/avahi-daemon.conf $INSTALL/etc/avahi
 
 mkdir -p $INSTALL/etc/avahi/services
-cp -PR $PKG_BUILD/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services
-cp -PR $PKG_BUILD/avahi-daemon/ssh.service $INSTALL/etc/avahi/services
+  cp -PR $PKG_BUILD/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services
+  cp -PR $PKG_BUILD/avahi-daemon/ssh.service $INSTALL/etc/avahi/services
 
 mkdir -p $INSTALL/etc/dbus-1/system.d
-cp -PR $PKG_BUILD/avahi-daemon/avahi-dbus.conf $INSTALL/etc/dbus-1/system.d
-
-mkdir -p $PYTHON_LIB_DIR/site-packages/avahi
-cp $PKG_BUILD/avahi-python/avahi/*.pyc $PYTHON_LIB_DIR/site-packages/avahi
+  cp -PR $PKG_BUILD/avahi-daemon/avahi-dbus.conf $INSTALL/etc/dbus-1/system.d
 
 mkdir -p $INSTALL/usr/share/avahi
-cp -PR $PKG_BUILD/service-type-database/service-types $INSTALL/usr/share/avahi
-cp -PR $PKG_BUILD/avahi-daemon/avahi-service.dtd $INSTALL/usr/share/avahi
+  cp -PR $PKG_BUILD/service-type-database/service-types $INSTALL/usr/share/avahi
+  cp -PR $PKG_BUILD/avahi-daemon/avahi-service.dtd $INSTALL/usr/share/avahi
 
 mkdir -p $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/ServiceTypeBrowser.introspect $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/HostNameResolver.introspect $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/EntryGroup.introspect $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/ServiceBrowser.introspect $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/Server.introspect $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/DomainBrowser.introspect $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/ServiceResolver.introspect $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/RecordBrowser.introspect $INSTALL/usr/share/avahi/introspection
-cp -PR $PKG_BUILD/avahi-daemon/AddressResolver.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/ServiceTypeBrowser.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/HostNameResolver.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/EntryGroup.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/ServiceBrowser.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/Server.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/DomainBrowser.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/ServiceResolver.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/RecordBrowser.introspect $INSTALL/usr/share/avahi/introspection
+  cp -PR $PKG_BUILD/avahi-daemon/AddressResolver.introspect $INSTALL/usr/share/avahi/introspection
 
 mkdir -p $INSTALL/usr/share/udhcpc
-cp $PKG_DIR/scripts/udhcp-avahi.script $INSTALL/usr/share/udhcpc/default.script
+  cp $PKG_DIR/scripts/udhcp-avahi.script $INSTALL/usr/share/udhcpc/default.script