diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template
index ff0b6ad8c02..2e4d3758fd5 100644
--- a/srcpkgs/apache-mpm-event/template
+++ b/srcpkgs/apache-mpm-event/template
@@ -23,11 +23,13 @@ long_desc="
 
  This MPM is experimental and less tested than the worker and prefork MPMs."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libuuid
-Add_dependency run pcre
+Add_dependency run libpcre
 Add_dependency run expat
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run gdbm
 Add_dependency run apr
 Add_dependency run apr-util
diff --git a/srcpkgs/apache-mpm-worker/template b/srcpkgs/apache-mpm-worker/template
index da9f5702eb7..3c1975a8351 100644
--- a/srcpkgs/apache-mpm-worker/template
+++ b/srcpkgs/apache-mpm-worker/template
@@ -20,11 +20,13 @@ long_desc="
  recommended especially for high-traffic sites because it is faster and has
  a smaller memory footprint than the traditional prefork MPM."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libuuid
-Add_dependency run pcre
+Add_dependency run libpcre
 Add_dependency run expat
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run gdbm
 Add_dependency run apr
 Add_dependency run apr-util
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index a868cc8aafe..641a03a4725 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.2.15
-revision=1
+revision=2
 wrksrc=httpd-${version}
 distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 build_style=gnu_configure
@@ -59,8 +59,8 @@ keep_empty_dirs=yes
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run libuuid
-Add_dependency run pcre
-Add_dependency run db
+Add_dependency run libpcre
+Add_dependency run libdb
 Add_dependency run gdbm
 Add_dependency run expat
 Add_dependency run libldap
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index e0d735dbc1c..5488e0f6766 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -5,7 +5,7 @@
 unset run_depends build_depends
 
 pkgname=cyrus-sasl
-revision=1
+revision=2
 configure_args="--with-saslauthd=/var/run/saslauthd
 --enable-login --enable-plain --enable-sql --disable-sqlite
 --enable-postgresql --enable-mysql --enable-ldapdb --with-ldap=/usr"
@@ -22,7 +22,7 @@ openrc_services="saslauthd default off"
 conf_files="/etc/conf.d/saslauthd"
 
 Add_dependency run glibc
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run libsasl
 Add_dependency run libldap
 Add_dependency run mit-krb5-libs
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 1c2e626acfa..a1eb26830e6 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,6 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=2.32.1
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --enable-gnome-keyring
@@ -36,7 +37,7 @@ Add_dependency run fontconfig
 Add_dependency run libpng
 Add_dependency run gdk-pixbuf
 Add_dependency run gtk+
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run libldap
 Add_dependency run libical
 Add_dependency run libsoup
diff --git a/srcpkgs/heimdal/heimdal-libs.template b/srcpkgs/heimdal/heimdal-libs.template
index 1e1209464a4..bab0b2e1c15 100644
--- a/srcpkgs/heimdal/heimdal-libs.template
+++ b/srcpkgs/heimdal/heimdal-libs.template
@@ -5,10 +5,10 @@ long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-revision=2
+revision=3
 
 Add_dependency run glibc
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run libssl
 Add_dependency run e2fsprogs-libs	">=1.4.10_1"
 Add_dependency run readline
diff --git a/srcpkgs/heimdal/template b/srcpkgs/heimdal/template
index 767802bd882..a639a777441 100644
--- a/srcpkgs/heimdal/template
+++ b/srcpkgs/heimdal/template
@@ -1,7 +1,7 @@
 # Template file for 'heimdal'
 pkgname=heimdal
 version=1.3.1
-revision=2
+revision=3
 distfiles="http://www.h5l.org/dist/src/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-shared=yes --without-x --datadir=/var/lib/heimdal
@@ -19,7 +19,7 @@ subpackages="heimdal-devel heimdal-libs"
 conf_files="/etc/krb5.conf"
 
 Add_dependency run glibc
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run libssl
 Add_dependency run readline
 Add_dependency run e2fsprogs-libs
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index e1b45862938..8650d8e8980 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,7 +1,7 @@
 # Template file for 'iproute2'
 pkgname=iproute2
 version=2.6.31
-revision=2
+revision=3
 distfiles="http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="IP Routing Utilities"
@@ -20,7 +20,7 @@ conf_files="
 /etc/iproute2/rt_tables"
 
 Add_dependency run glibc
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run iptables
 Add_dependency full perl		">=0"
 Add_dependency build db-devel
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 39d810c6228..8cd03344d17 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -1,7 +1,7 @@
 # Template file for 'libsasl'
 pkgname=libsasl
 version=2.1.23
-revision=1
+revision=2
 wrksrc="cyrus-sasl-${version}"
 distfiles="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-$version.tar.gz"
 build_style=gnu_configure
@@ -27,7 +27,7 @@ long_desc="
 subpackages="libsasl-devel"
 
 Add_dependency run glibc
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency build db-devel
 
 post_install()
diff --git a/srcpkgs/lightspark/template b/srcpkgs/lightspark/template
index 53c07625220..600f2fc86d6 100644
--- a/srcpkgs/lightspark/template
+++ b/srcpkgs/lightspark/template
@@ -1,6 +1,7 @@
 # Template file for 'lightspark'
 pkgname=lightspark
 version=0.4.4.3
+revision=1
 distfiles="http://launchpad.net/lightspark/trunk/$pkgname-0.4.4/+download/$pkgname-$version.tar.gz"
 build_style=custom-install
 short_desc="Modern, free, open-source flash player implementation"
@@ -24,7 +25,7 @@ Add_dependency run libstdc++
 Add_dependency run zlib
 Add_dependency run libffi
 Add_dependency run libxml++
-Add_dependency run pcre
+Add_dependency run libpcre
 Add_dependency run glib
 Add_dependency run glibmm
 Add_dependency run libcurl
diff --git a/srcpkgs/metalog/template b/srcpkgs/metalog/template
index b2697a77408..f8d690d76aa 100644
--- a/srcpkgs/metalog/template
+++ b/srcpkgs/metalog/template
@@ -1,7 +1,7 @@
 # Template file for 'metalog'
 pkgname=metalog
 version=1
-revision=4
+revision=5
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.lzma"
 build_style=gnu_configure
 configure_args="--with-unicode"
@@ -16,9 +16,11 @@ long_desc="
 conf_files="/etc/metalog.conf"
 openrc_services="metalog default true"
 
-Add_dependency full glibc
-Add_dependency full pcre
-Add_dependency full bzip2
+Add_dependency run glibc
+Add_dependency run libpcre
+Add_dependency run bzip2
+Add_dependency build pcre-devel
+Add_dependency build bzip2-devel
 
 post_install()
 {
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 613a5028992..cfe8304f914 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -1,6 +1,7 @@
 # Template file for 'mit-krb5'
 pkgname=mit-krb5
 version=1.8.3
+revision=1
 wrksrc="krb5-${version}"
 distfiles="http://web.mit.edu/Kerberos/dist/krb5/1.8/krb5-$version-signed.tar"
 build_style=gnu_configure
@@ -22,7 +23,7 @@ subpackages="$pkgname-devel $pkgname-libs $pkgname-client"
 conflicts="heimdal>=0"
 
 Add_dependency run glibc
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run e2fsprogs-libs
 Add_dependency run libssl
 Add_dependency run mit-krb5-libs
diff --git a/srcpkgs/pam/pam-userdb.template b/srcpkgs/pam/pam-userdb.template
index e1879bc3839..5c5058d8850 100644
--- a/srcpkgs/pam/pam-userdb.template
+++ b/srcpkgs/pam/pam-userdb.template
@@ -8,8 +8,10 @@ long_desc="${long_desc}
  username, and the data fields corresponding to the username keys are the
  passwords."
 
+revision=1
+
 Add_dependency run glibc
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run pam
 
 do_install()
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 0e137cb2170..eedaf364456 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,6 +1,7 @@
 # Template build file for 'perl'.
 pkgname=perl
 version=5.12.2
+revision=1
 distfiles="http://www.cpan.org/src/5.0/$pkgname-$version.tar.bz2"
 build_style=custom-install
 short_desc="Practical Extraction and Report Language"
@@ -19,7 +20,7 @@ long_desc="
 
 Add_dependency run glibc
 Add_dependency run gdbm
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency build gdbm-devel
 Add_dependency build db-devel
 
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 94db0dc4819..7bde4397759 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,6 +1,7 @@
 # Template build file for 'python'.
 pkgname=python
 version=2.7.1
+revision=1
 wrksrc="Python-$version"
 distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.bz2"
 configure_args="--with-threads --enable-ipv6 --with-signal-module
@@ -33,7 +34,7 @@ Add_dependency run bzip2
 Add_dependency run gdbm
 Add_dependency run libssl
 Add_dependency run expat
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run ncurses-libs
 Add_dependency run sqlite
 
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 78bdc15978e..e9d901ede72 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -21,7 +21,7 @@ long_desc="
 subpackages="ruby-devel ruby-gems ruby-irb ruby-rdoc ruby-ri"
 
 Add_dependency run glibc
-Add_dependency run db
+Add_dependency run libdb
 Add_dependency run gdbm
 Add_dependency run libssl
 Add_dependency run zlib