diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index 87343f76ff..07c3364bb0 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the HOWL compatibility
  libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run avahi-libs-devel
 Add_dependency run avahi-compat-libs
 
@@ -14,9 +16,7 @@ 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.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/libhowl.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-compat* \
 		${DESTDIR}/usr/lib/pkgconfig
diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template
index f70eb73a53..8a3f99531f 100644
--- a/srcpkgs/avahi/avahi-compat-libs.template
+++ b/srcpkgs/avahi/avahi-compat-libs.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains howl/mDNSResponder compatibility shared
  libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
@@ -14,6 +16,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
+	mv ${SRCPKGDESTDIR}/usr/lib/libhowl.so* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libdns_sd.so* ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index 734f6fa971..01f3da12ab 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the glib libraries
  provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run avahi-libs-devel
 Add_dependency run glib-devel
@@ -15,7 +17,6 @@ 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*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-g*.a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-g* \
 		${DESTDIR}/usr/lib/pkgconfig
diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template
index 0d3bed94a4..891201b6d3 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
@@ -17,6 +17,6 @@ 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/libavahi-glib.so* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-gobject.so* ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index 9aa57f9541..39b3e66025 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
@@ -20,8 +20,6 @@ do_install()
 	for f in common client core; do
 		mv ${SRCPKGDESTDIR}/usr/include/avahi-${f} \
 			${DESTDIR}/usr/include
-		mv ${SRCPKGDESTDIR}/usr/lib/libavahi-${f}.so \
-			${DESTDIR}/usr/lib
 		mv ${SRCPKGDESTDIR}/usr/lib/libavahi-${f}.a \
 			${DESTDIR}/usr/lib
 	done
diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template
index 9df9f624bb..ad59ee25ef 100644
--- a/srcpkgs/avahi/avahi-libs.template
+++ b/srcpkgs/avahi/avahi-libs.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains core shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
@@ -13,7 +15,7 @@ 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
+	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
 }
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index 64d6e4fbee..38f7b9a2eb 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the UI libraries
  provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run avahi-libs-devel
 Add_dependency run gtk+-devel
@@ -16,7 +18,6 @@ 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.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template
index 4f128464e2..6bb8219f7e 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
@@ -24,5 +24,5 @@ Add_dependency run gdbm
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.so.* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libavahi-ui.so* ${DESTDIR}/usr/lib
 }