diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 14bb9b8e6..2786ec926 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=5
+pkgrel=6
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
@@ -23,12 +23,14 @@ optdepends=('dbus: communicating with client applications'
             'mono: mono bindings'
             'python2-dbus: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'pygtk' 'mono' 'intltool' 'python2-dbus'
+makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
              'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
 backup=('etc/avahi/hosts'
         'etc/avahi/avahi-daemon.conf'
         'etc/avahi/services/ssh.service'
-        'etc/avahi/services/sftp-ssh.service')
+        'etc/avahi/services/sftp-ssh.service'
+        'usr/lib/avahi/service-types.db'
+        'usr/share/avahi/service-types')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
         'rc.d.patch')
 sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
@@ -44,10 +46,14 @@ build() {
 
 	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
 	patch -p1 -i ../rc.d.patch
-
+	
+	export MOC_QT3=/opt/qt/bin/moc
+	export MOC_QT4=/usr/lib/qt4/bin/moc
+	source /etc/profile.d/qt3.sh
+	source /etc/profile.d/qt4.sh
+	
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
-	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -72,6 +78,7 @@ package() {
 
 	cd "${pkgdir}"
 	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+	sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action
 
 	# howl and mdnsresponder compatability
 	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
diff --git a/extra/avahi/install b/extra/avahi/install
index 7c75c3dd4..13af96d2e 100644
--- a/extra/avahi/install
+++ b/extra/avahi/install
@@ -18,4 +18,5 @@ EOF
 post_remove() {
   getent passwd avahi &>/dev/null && userdel avahi >/dev/null
   getent group avahi &>/dev/null && groupdel avahi >/dev/null
+  true
 }