diff --git a/srcpkgs/avahi/avahi-autoipd.template b/srcpkgs/avahi/avahi-autoipd.template
index 79a58084f2..29f533396e 100644
--- a/srcpkgs/avahi/avahi-autoipd.template
+++ b/srcpkgs/avahi/avahi-autoipd.template
@@ -16,12 +16,7 @@ Add_dependency run net-tools
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/sbin
-	mkdir -p ${DESTDIR}/usr/share/man/man8
-	mkdir -p ${DESTDIR}/etc/avahi
-
-	mv ${SRCPKGDESTDIR}/usr/sbin/avahi-autoipd ${DESTDIR}/usr/sbin
-	mv ${SRCPKGDESTDIR}/usr/share/man/man8/avahi-autoipd* \
-		${DESTDIR}/usr/share/man/man8
-	mv ${SRCPKGDESTDIR}/etc/avahi/avahi-autoipd.action ${DESTDIR}/etc/avahi
+	vmove usr/sbin/avahi-autoipd usr/sbin
+	vmove "usr/share/man/man8/avahi-autoipd*" usr/share/man/man8
+	vmove etc/avahi/avahi-autoipd.action etc/avahi
 }
diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index 07c3364bb0..da062d63e0 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -6,18 +6,15 @@ long_desc="${long_desc}
  This package contains development files for the HOWL compatibility
  libraries provided by Avahi."
 
-revision=1
+revision=2
 
 Add_dependency run avahi-libs-devel
 Add_dependency run avahi-compat-libs
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include
-
-	mv ${SRCPKGDESTDIR}/usr/include/avahi-compat* ${DESTDIR}/usr/include
-	mv ${SRCPKGDESTDIR}/usr/lib/libhowl.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-compat* \
-		${DESTDIR}/usr/lib/pkgconfig
+	vmove "usr/include/avahi-compat*" usr/include
+	vmove usr/lib/libhowl.a usr/lib
+	vmove usr/lib/libdns_sd.a usr/lib
+	vmove "usr/lib/pkgconfig/avahi-compat*" usr/lib/pkgconfig
 }
diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template
index 8a3f99531f..d670712d88 100644
--- a/srcpkgs/avahi/avahi-compat-libs.template
+++ b/srcpkgs/avahi/avahi-compat-libs.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains howl/mDNSResponder compatibility shared
  libraries provided by Avahi."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run libssp
@@ -15,7 +15,6 @@ Add_dependency run avahi-libs
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libhowl.so* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.so* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libhowl.so*" usr/lib
+	vmove "usr/lib/libdns_sd.so*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template
index 3186160f59..b0aca5657a 100644
--- a/srcpkgs/avahi/avahi-discover.template
+++ b/srcpkgs/avahi/avahi-discover.template
@@ -16,17 +16,10 @@ noarch=yes
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/bin
-	mkdir -p ${DESTDIR}/usr/share/man/man1
-	mkdir -p ${DESTDIR}/usr/share/applications
-	mkdir -p ${DESTDIR}/usr/share/avahi/interfaces
-	mkdir -p ${DESTDIR}/usr/lib/python2.7/site-packages
-
-	mv ${SRCPKGDESTDIR}/usr/bin/avahi-discover ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/avahi-discover* \
-		${DESTDIR}/usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/share/applications/avahi-discover.desktop \
-		${DESTDIR}/usr/share/applications
-	mv ${SRCPKGDESTDIR}/usr/lib/python2.7/site-packages/avahi_discover \
-		${DESTDIR}/usr/lib/python2.7/site-packages
+	vmove usr/bin/avahi-discover usr/bin
+	vmove "usr/share/man/man1/avahi-discover*" usr/share/man/man1
+	vmove usr/share/applications/avahi-discover.desktop \
+		usr/share/applications
+	vmove usr/lib/python2.7/site-packages/avahi_discover \
+		usr/lib/python2.7/site-packages
 }
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index d3dee04aae..df7a4b0b96 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -6,15 +6,12 @@ long_desc="${long_desc}
  This package contains development files for the glib libraries
  provided by Avahi."
 
-revision=1
+revision=2
 Add_dependency run avahi-glib-libs
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include
-
-	mv ${SRCPKGDESTDIR}/usr/include/avahi-g* ${DESTDIR}/usr/include
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-g*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-g* \
-		${DESTDIR}/usr/lib/pkgconfig
+	vmove "usr/include/avahi-g*" usr/include
+	vmove "usr/lib/libavahi-g*.a" usr/lib
+	vmove "usr/lib/pkgconfig/avahi-g*" usr/lib/pkgconfig
 }
diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template
index a248a1ba68..620562e017 100644
--- a/srcpkgs/avahi/avahi-glib-libs.template
+++ b/srcpkgs/avahi/avahi-glib-libs.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the glib shared libraries provided by Avahi."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run libssp
@@ -15,9 +15,7 @@ Add_dependency run glib
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-glib.so* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-gobject.so* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/girepository* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libavahi-glib.so*" usr/lib
+	vmove "usr/lib/libavahi-gobject.so*" usr/lib
+	vmove "usr/lib/girepository*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index 49b364b229..30ec300ce2 100644
--- a/srcpkgs/avahi/avahi-libs-devel.template
+++ b/srcpkgs/avahi/avahi-libs-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains development files for the core libraries
  provided by Avahi."
 
-revision=1
+revision=2
 
 Add_dependency run glibc-devel
 Add_dependency run libssp-devel
@@ -15,17 +15,11 @@ Add_dependency run avahi-libs
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/{share,include}
-
 	for f in common client core; do
-		mv ${SRCPKGDESTDIR}/usr/include/avahi-${f} \
-			${DESTDIR}/usr/include
-		mv ${SRCPKGDESTDIR}/usr/lib/libavahi-${f}.a \
-			${DESTDIR}/usr/lib
+		vmove usr/include/avahi-${f} usr/include
+		vmove usr/lib/libavahi-${f}.a usr/lib
 	done
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-core.pc \
-		${DESTDIR}/usr/lib/pkgconfig
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-client.pc \
-		${DESTDIR}/usr/lib/pkgconfig
-	mv ${SRCPKGDESTDIR}/usr/share/gir-* ${DESTDIR}/usr/share
+	vmove usr/lib/pkgconfig/avahi-core.pc usr/lib/pkgconfig
+	vmove usr/lib/pkgconfig/avahi-client.pc usr/lib/pkgconfig
+	vmove "usr/share/gir-*" usr/share
 }
diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template
index af0f5713dd..0740b37254 100644
--- a/srcpkgs/avahi/avahi-libs.template
+++ b/srcpkgs/avahi/avahi-libs.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains core shared libraries provided by Avahi."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run libssp
@@ -14,9 +14,7 @@ Add_dependency run gdbm
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-client.so* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-core.so* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-common.so* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libavahi-client.so*" usr/lib
+	vmove "usr/lib/libavahi-core.so*" usr/lib
+	vmove "usr/lib/libavahi-common.so*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-python-utils.template b/srcpkgs/avahi/avahi-python-utils.template
index ff1037429e..4cc1c6696f 100644
--- a/srcpkgs/avahi/avahi-python-utils.template
+++ b/srcpkgs/avahi/avahi-python-utils.template
@@ -11,8 +11,6 @@ noarch=yes
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/bin/avahi-bookmarks ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/avahi-bookmarks* \
-		${DESTDIR}/usr/share/man/man1
+	vmove usr/bin/avahi-bookmarks usr/bin
+	vmove "usr/share/man/man1/avahi-bookmarks*" usr/share/man/man1
 }
diff --git a/srcpkgs/avahi/avahi-python.template b/srcpkgs/avahi/avahi-python.template
index e100951b17..3bb6c4219f 100644
--- a/srcpkgs/avahi/avahi-python.template
+++ b/srcpkgs/avahi/avahi-python.template
@@ -12,6 +12,5 @@ noarch=yes
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib
+	vmove "usr/lib/python*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index 54b01cf1b6..a5d74f37d8 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains development files for the UI libraries
  provided by Avahi."
 
-revision=1
+revision=2
 
 Add_dependency run glibc-devel
 Add_dependency run gtk+-devel
@@ -18,9 +18,7 @@ Add_dependency run avahi-ui-libs-gtk3
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/include
-
-	mv ${SRCPKGDESTDIR}/usr/include/avahi-ui* ${DESTDIR}/usr/include
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui* ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	vmove "usr/include/avahi-ui*" usr/include
+	vmove "usr/lib/libavahi-ui*" usr/lib
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
index d61e147a7d..845d655b0c 100644
--- a/srcpkgs/avahi/avahi-ui-libs-gtk3.template
+++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the GTK+3 UI shared libraries provided by Avahi."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run libssp
@@ -25,6 +25,5 @@ Add_dependency run gtk+3
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui-gtk3.so* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libavahi-ui-gtk3.so*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template
index ae85bb34a3..8af83b8e2f 100644
--- a/srcpkgs/avahi/avahi-ui-libs.template
+++ b/srcpkgs/avahi/avahi-ui-libs.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the UI shared libraries provided by Avahi."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run avahi-libs
@@ -25,6 +25,5 @@ Add_dependency run gdbm
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.so* ${DESTDIR}/usr/lib
+	vmove "usr/lib/libavahi-ui.so*" usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-utils.template b/srcpkgs/avahi/avahi-ui-utils.template
index 91e4acac54..8a7956b43d 100644
--- a/srcpkgs/avahi/avahi-ui-utils.template
+++ b/srcpkgs/avahi/avahi-ui-utils.template
@@ -31,11 +31,8 @@ Add_dependency run avahi
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1
-
-	mv ${SRCPKGDESTDIR}/usr/bin/b* ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/b* ${DESTDIR}/usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/share/applications ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/bin/avahi-discover-standalone \
-		${DESTDIR}/usr/bin
+	vmove "usr/bin/b*" usr/bin
+	vmove "usr/share/man/man1/b*" usr/share/man/man1
+	vmove usr/share/applications usr/share
+	vmove usr/bin/avahi-discover-standalone usr/bin
 }
diff --git a/srcpkgs/avahi/avahi-utils.template b/srcpkgs/avahi/avahi-utils.template
index 8e8ab9d63f..412c66d1b3 100644
--- a/srcpkgs/avahi/avahi-utils.template
+++ b/srcpkgs/avahi/avahi-utils.template
@@ -15,11 +15,9 @@ Add_dependency run avahi
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1
-
 	for f in browse publish resolve set-host-name; do
-		mv ${SRCPKGDESTDIR}/usr/bin/avahi-${f}* ${DESTDIR}/usr/bin
-		mv ${SRCPKGDESTDIR}/usr/share/man/man1/avahi-${f}* \
-			${DESTDIR}/usr/share/man/man1
+		vmove "usr/bin/avahi-${f}*" usr/bin
+		vmove "usr/share/man/man1/avahi-${f}*" \
+			usr/share/man/man1
 	done
 }
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index c7696fd08f..efa2f57365 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,6 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.30
+revision=1
 distfiles="http://www.avahi.org/download/avahi-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
@@ -19,9 +20,6 @@ long_desc="
  a network and instantly find printers to print to, files to look at and
  people to talk to."
 
-# Build PIC objects!
-CFLAGS="-fPIC"
-
 # Create avahi and netdev system accounts.
 system_accounts="avahi netdev"
 openrc_services="avahi-daemon default true avahi-dnsconfd default true"
@@ -56,6 +54,5 @@ Add_dependency build glib-devel
 Add_dependency build expat-devel
 Add_dependency build pygtk-devel
 Add_dependency build dbus-python
-Add_dependency build libglade-devel
 Add_dependency build gtk+3-devel
 Add_dependency build gobject-introspection