diff --git a/templates/Thunar/devel.template b/templates/Thunar/devel.template
index a915f7bdf3..4acbc61261 100644
--- a/templates/Thunar/devel.template
+++ b/templates/Thunar/devel.template
@@ -9,12 +9,10 @@ Add_dependency run Thunar
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/thunarx-1
+	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/share
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/thunarx-1/*.la ${DESTDIR}/usr/lib/thunarx-1
 	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
 }
diff --git a/templates/babl/devel.template b/templates/babl/devel.template
index 22a0d5e75e..60a5aea8b7 100644
--- a/templates/babl/devel.template
+++ b/templates/babl/devel.template
@@ -14,6 +14,5 @@ do_install()
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
 }
diff --git a/templates/gegl/devel.template b/templates/gegl/devel.template
index 50669d7896..aa1fb4a25d 100644
--- a/templates/gegl/devel.template
+++ b/templates/gegl/devel.template
@@ -9,16 +9,11 @@ Add_dependency run gegl
 
 do_install()
 {
-	local lver="0.0"
-
-	mkdir -p ${DESTDIR}/usr/lib/gegl-${lver}
+	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/bin
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/gegl-${lver}/*.*a \
-		${DESTDIR}/usr/lib/gegl-${lver}
 }
diff --git a/templates/gimp/devel.template b/templates/gimp/devel.template
index 86c3ab7acf..93fcde3d1f 100644
--- a/templates/gimp/devel.template
+++ b/templates/gimp/devel.template
@@ -13,7 +13,6 @@ do_install()
 	mkdir -p ${DESTDIR}/usr/share
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
 	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
diff --git a/templates/gst-plugins-base/devel.template b/templates/gst-plugins-base/devel.template
index d191507d06..6914fd2525 100644
--- a/templates/gst-plugins-base/devel.template
+++ b/templates/gst-plugins-base/devel.template
@@ -11,13 +11,10 @@ do_install()
 {
 	local lver="0.10"
 
-	mkdir -p ${DESTDIR}/usr/lib/gstreamer-${lver}
+	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/share
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/gstreamer-${lver}/*.*a \
-		${DESTDIR}/usr/lib/gstreamer-${lver}
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
 }
diff --git a/templates/metalog/template b/templates/metalog/template
index f30c3d2078..f259dc6db3 100644
--- a/templates/metalog/template
+++ b/templates/metalog/template
@@ -1,7 +1,7 @@
 # Template file for 'metalog'
 pkgname=metalog
 version=1
-revision=2
+revision=3
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.lzma"
 build_style=gnu_configure
 configure_args="--with-unicode"
@@ -19,7 +19,6 @@ openrc_services="metalog default"
 Add_dependency full glibc
 Add_dependency full pcre
 Add_dependency full bzip2
-Add_dependency build lzma-utils
 
 post_install()
 {
diff --git a/templates/pam/devel.template b/templates/pam/devel.template
index 80f77a6041..b6b07880b2 100644
--- a/templates/pam/devel.template
+++ b/templates/pam/devel.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
 Add_dependency run pam
 
 do_install()
@@ -14,7 +15,5 @@ do_install()
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/lib/*.*a ${DESTDIR}/lib
 	mv ${SRCPKGDESTDIR}/lib/*.so ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/lib/security/*.*a ${DESTDIR}/lib/security
 }
diff --git a/templates/webkit-gtk/devel.template b/templates/webkit-gtk/devel.template
index d587cef0e7..9b67652170 100644
--- a/templates/webkit-gtk/devel.template
+++ b/templates/webkit-gtk/devel.template
@@ -11,7 +11,6 @@ do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 }
diff --git a/templates/xfce4-panel/devel.template b/templates/xfce4-panel/devel.template
index 76789df63a..a0340486f1 100644
--- a/templates/xfce4-panel/devel.template
+++ b/templates/xfce4-panel/devel.template
@@ -9,13 +9,10 @@ Add_dependency run xfce4-panel
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib/xfce4/panel-plugins
+	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/share
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/lib/xfce4/panel-plugins/*.la \
-		${DESTDIR}/usr/lib/xfce4/panel-plugins
 }