From accb1ff0d65add6040afef0d1901dd0bdc303422 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Sat, 12 Nov 2011 05:01:02 +0000
Subject: [PATCH] Update base-system and dep. pkgs for new rshlib thing

---
 srcpkgs/MesaLib/MesaLib.rshlibs               | 11 ++++++++
 srcpkgs/MesaLib/libEGL.rshlibs                | 18 +++++++++++++
 srcpkgs/MesaLib/libEGL.template               | 13 +--------
 srcpkgs/MesaLib/libGL.rshlibs                 | 13 +++++++++
 srcpkgs/MesaLib/libGL.template                | 11 +-------
 srcpkgs/MesaLib/libGLES.rshlibs               |  2 ++
 srcpkgs/MesaLib/libGLES.template              |  4 +--
 srcpkgs/MesaLib/libGLU.rshlibs                |  5 ++++
 srcpkgs/MesaLib/libGLU.template               |  6 +----
 srcpkgs/MesaLib/libGLw.rshlibs                |  4 +++
 srcpkgs/MesaLib/libGLw.template               |  6 +----
 srcpkgs/MesaLib/libOpenVG.rshlibs             |  2 ++
 srcpkgs/MesaLib/libOpenVG.template            |  3 +--
 srcpkgs/MesaLib/libglapi.rshlibs              |  2 ++
 srcpkgs/MesaLib/libglapi.template             |  3 +--
 srcpkgs/MesaLib/template                      |  7 +----
 srcpkgs/acl/acl-progs.rshlibs                 |  2 ++
 srcpkgs/acl/acl-progs.template                |  3 +--
 srcpkgs/acl/acl.rshlibs                       |  2 ++
 srcpkgs/acl/template                          |  3 +--
 srcpkgs/acpid/acpid.rshlibs                   |  1 +
 srcpkgs/acpid/template                        |  3 +--
 srcpkgs/atk/atk.rshlibs                       |  6 +++++
 srcpkgs/atk/template                          |  3 +--
 srcpkgs/attr/attr-progs.rshlibs               |  2 ++
 srcpkgs/attr/attr-progs.template              |  3 +--
 srcpkgs/attr/attr.rshlibs                     |  1 +
 srcpkgs/attr/template                         |  2 +-
 srcpkgs/bison/bison.rshlibs                   |  1 +
 srcpkgs/bison/template                        |  1 +
 srcpkgs/bridge-utils/bridge-utils.rshlibs     |  1 +
 srcpkgs/bridge-utils/template                 |  2 +-
 srcpkgs/btrfs-progs/btrfs-progs.rshlibs       |  2 ++
 srcpkgs/btrfs-progs/template                  |  3 +--
 srcpkgs/cairo/cairo-devel.rshlibs             |  5 ++++
 srcpkgs/cairo/cairo-devel.template            |  4 +--
 srcpkgs/cairo/cairo.rshlibs                   | 19 +++++++++++++
 srcpkgs/cairo/template                        | 14 +---------
 srcpkgs/colord/colord.rshlibs                 | 14 ++++++++++
 srcpkgs/colord/template                       |  9 +------
 srcpkgs/coreutils/coreutils.rshlibs           |  7 +++++
 srcpkgs/coreutils/template                    |  6 +----
 srcpkgs/cracklib/cracklib-python.rshlibs      |  3 +++
 srcpkgs/cracklib/cracklib-python.template     |  5 +---
 srcpkgs/cracklib/cracklib.rshlibs             |  2 ++
 srcpkgs/cracklib/template                     |  3 +--
 srcpkgs/curl/curl.rshlibs                     |  4 +++
 srcpkgs/curl/libcurl.rshlibs                  | 13 +++++++++
 srcpkgs/curl/libcurl.template                 |  8 +-----
 srcpkgs/curl/template                         |  4 +--
 srcpkgs/dash/dash.rshlibs                     |  1 +
 srcpkgs/dash/template                         |  2 +-
 srcpkgs/db/db.rshlibs                         |  3 +++
 srcpkgs/db/libdb.rshlibs                      |  5 ++++
 srcpkgs/db/libdb.template                     |  4 +--
 srcpkgs/db/template                           |  4 +--
 srcpkgs/dbus/dbus-libs.rshlibs                |  3 +++
 srcpkgs/dbus/dbus-libs.template               |  2 +-
 srcpkgs/dbus/dbus-x11.rshlibs                 |  3 +++
 srcpkgs/dbus/dbus-x11.template                |  3 +--
 srcpkgs/dbus/dbus.rshlibs                     |  5 ++++
 srcpkgs/dbus/template                         |  5 +---
 srcpkgs/dcron/dcron.rshlibs                   |  1 +
 srcpkgs/dcron/template                        |  3 +--
 srcpkgs/dhcpcd/dhcpcd.rshlibs                 |  2 ++
 srcpkgs/dhcpcd/template                       |  3 +--
 srcpkgs/docbook2x/docbook2x.rshlibs           |  1 +
 srcpkgs/docbook2x/template                    |  2 +-
 srcpkgs/e2fsprogs/e2fsprogs-libs.rshlibs      |  4 +++
 srcpkgs/e2fsprogs/e2fsprogs-libs.template     |  2 +-
 srcpkgs/e2fsprogs/e2fsprogs.rshlibs           |  7 +++++
 srcpkgs/e2fsprogs/template                    |  6 +----
 srcpkgs/ed/ed.rshlibs                         |  1 +
 srcpkgs/ed/template                           |  2 +-
 srcpkgs/eject/eject.rshlibs                   |  1 +
 srcpkgs/eject/template                        |  3 +--
 srcpkgs/expat/expat.rshlibs                   |  1 +
 srcpkgs/expat/template                        |  3 +--
 srcpkgs/findutils/findutils.rshlibs           |  3 +++
 srcpkgs/findutils/template                    |  3 +--
 srcpkgs/flex/flex.rshlibs                     |  2 ++
 srcpkgs/flex/template                         |  1 +
 srcpkgs/fontconfig/fontconfig.rshlibs         |  5 ++++
 srcpkgs/fontconfig/template                   |  7 +----
 srcpkgs/freetype/freetype.rshlibs             |  3 +++
 srcpkgs/freetype/template                     |  4 +--
 srcpkgs/fuse/fuse.rshlibs                     |  4 +++
 srcpkgs/fuse/template                         |  2 +-
 srcpkgs/gawk/gawk.rshlibs                     |  3 +++
 srcpkgs/gawk/template                         |  2 +-
 srcpkgs/gdbm/gdbm.rshlibs                     |  1 +
 srcpkgs/gdbm/template                         |  3 +--
 srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.rshlibs   |  5 ++++
 srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template  |  5 +---
 srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs         | 13 +++++++++
 srcpkgs/gdk-pixbuf/template                   |  7 +----
 srcpkgs/gettext/gettext-libs.rshlibs          |  2 ++
 srcpkgs/gettext/gettext-libs.template         |  4 +--
 srcpkgs/gettext/gettext.rshlibs               |  7 +++++
 srcpkgs/gettext/template                      |  5 +---
 srcpkgs/git/git.rshlibs                       |  7 +++++
 srcpkgs/git/template                          |  6 +----
 srcpkgs/glib/glib-devel.rshlibs               |  4 +++
 srcpkgs/glib/glib-devel.template              |  3 +--
 srcpkgs/glib/glib.rshlibs                     |  8 ++++++
 srcpkgs/glib/template                         |  5 +---
 srcpkgs/gnutls/gnutls-tools.rshlibs           |  5 ++++
 srcpkgs/gnutls/gnutls-tools.template          |  4 +--
 srcpkgs/gnutls/gnutls.rshlibs                 | 11 ++++++++
 srcpkgs/gnutls/template                       |  9 +------
 .../gobject-introspection.rshlibs             | 11 ++++++++
 .../libgirepository.rshlibs                   | 11 ++++++++
 .../libgirepository.template                  |  4 +--
 srcpkgs/gobject-introspection/template        |  7 +----
 srcpkgs/gperf/gperf.rshlibs                   |  4 +++
 srcpkgs/gperf/template                        |  5 +---
 srcpkgs/grep/grep.rshlibs                     |  2 ++
 srcpkgs/grep/template                         |  4 +--
 srcpkgs/groff/groff.rshlibs                   |  4 +++
 srcpkgs/groff/template                        |  4 +--
 srcpkgs/gtk+/gtk+-demo.rshlibs                | 11 ++++++++
 srcpkgs/gtk+/gtk+-demo.template               |  7 +----
 srcpkgs/gtk+/gtk+.rshlibs                     | 27 +++++++++++++++++++
 srcpkgs/gtk+/template                         | 19 +------------
 srcpkgs/gtk+3/gtk+3-demo.rshlibs              | 12 +++++++++
 srcpkgs/gtk+3/gtk+3-demo.template             |  7 +----
 srcpkgs/gtk+3/gtk+3.rshlibs                   | 27 +++++++++++++++++++
 srcpkgs/gtk+3/template                        | 18 +------------
 srcpkgs/ifenslave/ifenslave.rshlibs           |  1 +
 srcpkgs/ifenslave/template                    |  3 +--
 srcpkgs/iproute2/iproute2.rshlibs             |  6 +++++
 srcpkgs/iproute2/template                     |  4 +--
 srcpkgs/iptables/iptables.rshlibs             |  3 +++
 srcpkgs/iptables/template                     |  3 +--
 srcpkgs/iputils/iputils.rshlibs               |  4 +++
 srcpkgs/iputils/template                      |  4 +--
 srcpkgs/jpeg/jpeg-tools.rshlibs               |  2 ++
 srcpkgs/jpeg/jpeg-tools.template              |  4 +--
 srcpkgs/jpeg/jpeg.rshlibs                     |  1 +
 srcpkgs/jpeg/template                         |  3 +--
 srcpkgs/kbd/kbd.rshlibs                       |  1 +
 srcpkgs/kbd/template                          |  3 +--
 srcpkgs/lcms2/lcms2.rshlibs                   |  4 +++
 srcpkgs/lcms2/template                        |  4 +--
 srcpkgs/less/less.rshlibs                     |  3 +++
 srcpkgs/less/template                         |  4 +--
 srcpkgs/libICE/libICE.rshlibs                 |  1 +
 srcpkgs/libICE/template                       |  2 +-
 srcpkgs/libSM/libSM.rshlibs                   |  3 +++
 srcpkgs/libSM/template                        |  4 +--
 srcpkgs/libX11/libX11.rshlibs                 |  3 +++
 srcpkgs/libX11/template                       |  3 +--
 srcpkgs/libXau/libXau.rshlibs                 |  1 +
 srcpkgs/libXau/template                       |  3 +--
 srcpkgs/libXcomposite/libXcomposite.rshlibs   |  2 ++
 srcpkgs/libXcomposite/template                |  3 +--
 srcpkgs/libXcursor/libXcursor.rshlibs         |  4 +++
 srcpkgs/libXcursor/template                   |  5 +---
 srcpkgs/libXdamage/libXdamage.rshlibs         |  3 +++
 srcpkgs/libXdamage/template                   |  4 +--
 srcpkgs/libXdmcp/libXdmcp.rshlibs             |  1 +
 srcpkgs/libXdmcp/template                     |  3 +--
 srcpkgs/libXext/libXext.rshlibs               |  2 ++
 srcpkgs/libXext/template                      |  3 +--
 srcpkgs/libXfixes/libXfixes.rshlibs           |  2 ++
 srcpkgs/libXfixes/template                    |  3 +--
 srcpkgs/libXft/libXft.rshlibs                 |  5 ++++
 srcpkgs/libXft/template                       |  7 +----
 srcpkgs/libXi/libXi.rshlibs                   |  3 +++
 srcpkgs/libXi/template                        |  4 +--
 srcpkgs/libXinerama/libXinerama.rshlibs       |  3 +++
 srcpkgs/libXinerama/template                  |  5 +---
 srcpkgs/libXrandr/libXrandr.rshlibs           |  4 +++
 srcpkgs/libXrandr/template                    |  5 +---
 srcpkgs/libXrender/libXrender.rshlibs         |  2 ++
 srcpkgs/libXrender/template                   |  3 +--
 srcpkgs/libXt/libXt.rshlibs                   |  4 +++
 srcpkgs/libXt/template                        |  5 +---
 srcpkgs/libXxf86vm/libXxf86vm.rshlibs         |  3 +++
 srcpkgs/libXxf86vm/template                   |  5 +---
 srcpkgs/libarchive/bsdcpio.rshlibs            |  8 ++++++
 srcpkgs/libarchive/bsdcpio.template           |  9 +------
 srcpkgs/libarchive/bsdtar.rshlibs             |  8 ++++++
 srcpkgs/libarchive/bsdtar.template            |  9 +------
 srcpkgs/libarchive/libarchive.rshlibs         |  8 ++++++
 srcpkgs/libarchive/template                   |  9 +------
 srcpkgs/libcap/libcap-pam.rshlibs             |  2 ++
 srcpkgs/libcap/libcap-pam.template            |  3 +--
 srcpkgs/libcap/libcap-progs.rshlibs           |  2 ++
 srcpkgs/libcap/libcap-progs.template          |  3 +--
 srcpkgs/libcap/libcap.rshlibs                 |  2 ++
 srcpkgs/libcap/template                       |  4 +--
 srcpkgs/libdrm/libdrm.rshlibs                 |  3 +++
 srcpkgs/libdrm/template                       |  3 +--
 srcpkgs/libfetch/libfetch.rshlibs             |  3 +++
 srcpkgs/libfetch/template                     |  3 +--
 srcpkgs/libffi/libffi.rshlibs                 |  1 +
 srcpkgs/libffi/template                       |  2 +-
 srcpkgs/libgcrypt/libgcrypt-devel.rshlibs     |  1 +
 srcpkgs/libgcrypt/libgcrypt-devel.template    |  2 +-
 srcpkgs/libgcrypt/libgcrypt.rshlibs           |  2 ++
 srcpkgs/libgcrypt/template                    |  3 +--
 srcpkgs/libgpg-error/libgpg-error.rshlibs     |  1 +
 srcpkgs/libgpg-error/template                 |  2 +-
 srcpkgs/libgudev/libgudev.rshlibs             |  7 +++++
 srcpkgs/libgudev/template                     |  4 +--
 srcpkgs/libidn/libidn.rshlibs                 |  1 +
 srcpkgs/libidn/template                       |  2 +-
 srcpkgs/libldap/libldap.rshlibs               |  6 +++++
 srcpkgs/libldap/template                      |  4 +--
 srcpkgs/libnl/libnl.rshlibs                   |  2 ++
 srcpkgs/libnl/template                        |  3 +--
 srcpkgs/libnotify/libnotify.rshlibs           |  9 +++++++
 srcpkgs/libnotify/template                    |  4 +--
 srcpkgs/libpciaccess/libpciaccess.rshlibs     |  1 +
 srcpkgs/libpciaccess/template                 |  2 +-
 srcpkgs/libpipeline/libpipeline.rshlibs       |  1 +
 srcpkgs/libpipeline/template                  |  2 +-
 srcpkgs/libpng/libpng.rshlibs                 |  3 +++
 srcpkgs/libpng/template                       |  3 +--
 srcpkgs/libsasl/libsasl.rshlibs               |  4 +++
 srcpkgs/libsasl/template                      |  4 +--
 srcpkgs/libtasn1/libtasn1-tools.rshlibs       |  2 ++
 srcpkgs/libtasn1/libtasn1-tools.template      |  3 +--
 srcpkgs/libtasn1/libtasn1.rshlibs             |  1 +
 srcpkgs/libtasn1/template                     |  2 +-
 srcpkgs/libtool/libltdl.rshlibs               |  2 ++
 srcpkgs/libtool/libltdl.template              |  2 +-
 srcpkgs/libusb-compat/libusb-compat.rshlibs   |  2 ++
 srcpkgs/libusb-compat/template                |  4 +--
 srcpkgs/libusb/libusb.rshlibs                 |  3 +++
 srcpkgs/libusb/template                       |  2 +-
 srcpkgs/libxcb/libxcb.rshlibs                 |  3 +++
 srcpkgs/libxcb/template                       |  4 +--
 srcpkgs/libxml2/libxml2-python.rshlibs        |  8 ++++++
 srcpkgs/libxml2/libxml2-python.template       |  5 +---
 srcpkgs/libxml2/libxml2.rshlibs               |  4 +++
 srcpkgs/libxml2/template                      |  4 +--
 srcpkgs/libxslt/libxslt-python.rshlibs        |  8 ++++++
 srcpkgs/libxslt/libxslt-python.template       |  8 +-----
 srcpkgs/libxslt/libxslt.rshlibs               |  6 +++++
 srcpkgs/libxslt/template                      |  7 +----
 srcpkgs/llvm/clang.rshlibs                    |  5 ++++
 srcpkgs/llvm/clang.template                   |  6 +----
 srcpkgs/llvm/libclang.rshlibs                 |  6 +++++
 srcpkgs/llvm/libclang.template                |  6 +----
 srcpkgs/llvm/libllvm.rshlibs                  |  7 +++++
 srcpkgs/llvm/libllvm.template                 |  6 +----
 srcpkgs/llvm/llvm.rshlibs                     |  7 +++++
 srcpkgs/llvm/template                         |  6 +----
 srcpkgs/logrotate/logrotate.rshlibs           |  2 ++
 srcpkgs/logrotate/template                    |  3 +--
 srcpkgs/lzo/lzo.rshlibs                       |  1 +
 srcpkgs/lzo/template                          |  2 +-
 srcpkgs/makedepend/makedepend.rshlibs         |  1 +
 srcpkgs/makedepend/template                   |  2 +-
 srcpkgs/man-db/man-db.rshlibs                 |  4 +++
 srcpkgs/man-db/template                       |  5 +---
 srcpkgs/mercurial/mercurial.rshlibs           |  3 +++
 srcpkgs/mercurial/template                    |  3 +--
 srcpkgs/mit-krb5/mit-krb5-client.rshlibs      | 10 +++++++
 srcpkgs/mit-krb5/mit-krb5-client.template     |  4 +--
 srcpkgs/mit-krb5/mit-krb5-libs.rshlibs        |  5 ++++
 srcpkgs/mit-krb5/mit-krb5-libs.template       |  3 +--
 srcpkgs/mit-krb5/mit-krb5.rshlibs             | 16 +++++++++++
 srcpkgs/mit-krb5/template                     |  6 +----
 .../module-init-tools.rshlibs                 |  1 +
 srcpkgs/module-init-tools/template            |  2 +-
 srcpkgs/mysql/libmysqlclient.rshlibs          |  8 ++++++
 srcpkgs/mysql/libmysqlclient.template         |  4 +--
 srcpkgs/mysql/libndbclient.rshlibs            |  5 ++++
 srcpkgs/mysql/libndbclient.template           |  2 +-
 srcpkgs/mysql/mysql-client.rshlibs            | 14 ++++++++++
 srcpkgs/mysql/mysql-client.template           | 10 +------
 srcpkgs/mysql/mysql-ndb.rshlibs               |  7 +++++
 srcpkgs/mysql/mysql-ndb.template              |  7 +----
 srcpkgs/mysql/mysql.rshlibs                   | 12 +++++++++
 srcpkgs/mysql/template                        |  7 +----
 srcpkgs/ntfs-3g/ntfs-3g.rshlibs               |  4 +++
 srcpkgs/ntfs-3g/template                      |  4 +--
 srcpkgs/ntp/ntp.rshlibs                       |  5 ++++
 srcpkgs/ntp/template                          |  5 +---
 srcpkgs/openssh/openssh-client.rshlibs        |  6 +++++
 srcpkgs/openssh/openssh-client.template       |  5 +---
 srcpkgs/openssh/openssh-server.rshlibs        | 10 +++++++
 srcpkgs/openssh/openssh-server.template       |  9 +------
 srcpkgs/openssh/openssh.rshlibs               |  5 ++++
 srcpkgs/openssh/template                      |  4 +--
 srcpkgs/openssl/libssl.rshlibs                |  3 +++
 srcpkgs/openssl/libssl.template               |  3 +--
 srcpkgs/openssl/openssl.rshlibs               |  5 ++++
 srcpkgs/openssl/template                      |  4 +--
 srcpkgs/pam/pam-userdb.rshlibs                |  5 ++++
 srcpkgs/pam/pam-userdb.template               |  4 +--
 srcpkgs/pam/pam.rshlibs                       |  6 +++++
 srcpkgs/pam/template                          |  3 +--
 srcpkgs/pango/pango.rshlibs                   | 14 ++++++++++
 srcpkgs/pango/template                        |  9 +------
 srcpkgs/pciutils/pciutils.rshlibs             |  2 ++
 srcpkgs/pciutils/template                     |  2 +-
 srcpkgs/pcre/libpcre.rshlibs                  |  4 +++
 srcpkgs/pcre/libpcre.template                 |  4 +--
 srcpkgs/pcre/pcre.rshlibs                     |  5 ++++
 srcpkgs/pcre/template                         |  5 +---
 .../perl-XML-Parser/perl-XML-Parser.rshlibs   |  2 ++
 srcpkgs/perl-XML-Parser/template              |  3 +--
 srcpkgs/perl/perl.rshlibs                     | 10 +++++++
 srcpkgs/perl/template                         |  4 +--
 srcpkgs/pixman/pixman.rshlibs                 |  3 +++
 srcpkgs/pixman/template                       |  2 +-
 srcpkgs/pkg-config/pkg-config.rshlibs         |  2 ++
 srcpkgs/pkg-config/template                   |  3 +--
 srcpkgs/polkit/polkit.rshlibs                 | 10 +++++++
 srcpkgs/polkit/template                       |  6 +----
 srcpkgs/popt/popt.rshlibs                     |  1 +
 srcpkgs/popt/template                         |  2 +-
 srcpkgs/postgresql/postgresql-client.rshlibs  |  5 ++++
 srcpkgs/postgresql/postgresql-client.template |  6 +----
 .../postgresql/postgresql-libs-devel.rshlibs  |  2 ++
 .../postgresql/postgresql-libs-devel.template |  2 +-
 srcpkgs/postgresql/postgresql-libs.rshlibs    |  6 +++++
 srcpkgs/postgresql/postgresql-libs.template   |  3 +--
 srcpkgs/postgresql/postgresql-plperl.rshlibs  |  8 ++++++
 srcpkgs/postgresql/postgresql-plperl.template |  3 +--
 .../postgresql/postgresql-plpython.rshlibs    |  6 +++++
 .../postgresql/postgresql-plpython.template   |  3 +--
 srcpkgs/postgresql/postgresql-pltcl.rshlibs   |  5 ++++
 srcpkgs/postgresql/postgresql-pltcl.template  |  3 +--
 srcpkgs/postgresql/postgresql.rshlibs         |  8 ++++++
 srcpkgs/postgresql/template                   |  6 +----
 srcpkgs/procps/procps.rshlibs                 |  2 ++
 srcpkgs/procps/template                       |  4 +--
 srcpkgs/proplib/proplib.rshlibs               |  3 +++
 srcpkgs/proplib/template                      |  3 +--
 srcpkgs/psmisc/psmisc.rshlibs                 |  2 ++
 srcpkgs/psmisc/template                       |  3 +--
 srcpkgs/python/python.rshlibs                 | 19 +++++++++++++
 srcpkgs/python/template                       | 13 +--------
 srcpkgs/readline/readline.rshlibs             |  2 ++
 srcpkgs/readline/template                     |  4 +--
 srcpkgs/rsyslog/rsyslog-gnutls.rshlibs        |  2 ++
 srcpkgs/rsyslog/rsyslog-gnutls.template       |  3 +--
 srcpkgs/rsyslog/rsyslog-gssapi.rshlibs        |  2 ++
 srcpkgs/rsyslog/rsyslog-gssapi.template       |  3 +--
 srcpkgs/rsyslog/rsyslog-mysql.rshlibs         |  8 ++++++
 srcpkgs/rsyslog/rsyslog-mysql.template        |  5 +---
 srcpkgs/rsyslog/rsyslog-postgresql.rshlibs    |  2 ++
 srcpkgs/rsyslog/rsyslog-postgresql.template   |  3 +--
 srcpkgs/rsyslog/rsyslog.rshlibs               |  5 ++++
 srcpkgs/rsyslog/template                      |  4 +--
 srcpkgs/sed/sed.rshlibs                       |  2 ++
 srcpkgs/sed/template                          |  4 +--
 srcpkgs/shadow/shadow.rshlibs                 |  4 +++
 srcpkgs/shadow/template                       |  4 +--
 srcpkgs/sqlite/sqlite-tcl.rshlibs             |  2 ++
 srcpkgs/sqlite/sqlite-tcl.template            |  2 +-
 srcpkgs/sqlite/sqlite.rshlibs                 |  4 +++
 srcpkgs/sqlite/template                       |  3 +--
 srcpkgs/sudo/sudo.rshlibs                     |  5 ++++
 srcpkgs/sudo/template                         |  4 +--
 srcpkgs/sysfsutils/libsysfs.rshlibs           |  1 +
 srcpkgs/sysfsutils/libsysfs.template          |  3 +--
 srcpkgs/sysfsutils/sysfsutils.rshlibs         |  2 ++
 srcpkgs/sysfsutils/template                   |  3 +--
 srcpkgs/systemd/systemd-admin.rshlibs         |  6 +++++
 srcpkgs/systemd/systemd-admin.template        |  4 +--
 .../systemd-gnome-passwd-agent.rshlibs        |  8 ++++++
 .../systemd-gnome-passwd-agent.template       |  5 +---
 srcpkgs/systemd/systemd.rshlibs               | 11 ++++++++
 srcpkgs/systemd/template                      |  8 +-----
 srcpkgs/talloc/talloc.rshlibs                 |  1 +
 srcpkgs/talloc/template                       |  2 +-
 srcpkgs/tcl/tcl.rshlibs                       |  4 +++
 srcpkgs/tcl/template                          |  2 +-
 .../tcp_wrappers/tcp_wrappers-libs.rshlibs    |  2 ++
 .../tcp_wrappers/tcp_wrappers-libs.template   |  3 +--
 srcpkgs/tcp_wrappers/tcp_wrappers.rshlibs     |  2 ++
 srcpkgs/tcp_wrappers/template                 |  3 +--
 srcpkgs/texinfo/template                      |  4 +--
 srcpkgs/texinfo/texinfo.rshlibs               |  2 ++
 srcpkgs/tiff/template                         |  6 +----
 srcpkgs/tiff/tiff.rshlibs                     |  6 +++++
 srcpkgs/tzdata/template                       |  1 +
 srcpkgs/tzdata/tzdata.rshlibs                 |  1 +
 srcpkgs/udev/libudev.rshlibs                  |  2 ++
 srcpkgs/udev/libudev.template                 |  2 +-
 srcpkgs/udev/template                         |  5 +---
 srcpkgs/udev/udev.rshlibs                     |  6 +++++
 srcpkgs/usbutils/template                     |  4 +--
 srcpkgs/usbutils/usbutils.rshlibs             |  2 ++
 srcpkgs/util-linux/libblkid.rshlibs           |  2 ++
 srcpkgs/util-linux/libblkid.template          |  3 +--
 srcpkgs/util-linux/libmount.rshlibs           |  3 +++
 srcpkgs/util-linux/libmount.template          |  4 +--
 srcpkgs/util-linux/libuuid.rshlibs            |  2 ++
 srcpkgs/util-linux/libuuid.template           |  2 +-
 srcpkgs/util-linux/template                   |  8 +-----
 srcpkgs/util-linux/util-linux.rshlibs         |  7 +++++
 srcpkgs/vala/libvala.rshlibs                  |  6 +++++
 srcpkgs/vala/libvala.template                 |  3 +--
 srcpkgs/vala/template                         |  4 +--
 srcpkgs/vala/vala.rshlibs                     |  7 +++++
 srcpkgs/vim/template                          |  4 +--
 srcpkgs/vim/vim.rshlibs                       |  5 ++++
 srcpkgs/wget/template                         |  4 +--
 srcpkgs/wget/wget.rshlibs                     |  5 ++++
 srcpkgs/which/template                        |  1 +
 srcpkgs/which/which.rshlibs                   |  1 +
 srcpkgs/wireless_tools/template               |  3 +--
 srcpkgs/wireless_tools/wireless_tools.rshlibs |  2 ++
 srcpkgs/wpa_supplicant/template               |  7 +----
 srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs |  7 +++++
 srcpkgs/xbps/template                         |  7 +----
 srcpkgs/xbps/xbps.rshlibs                     |  7 +++++
 srcpkgs/xfsprogs/template                     |  6 +----
 srcpkgs/xfsprogs/xfsprogs-libs.rshlibs        |  1 +
 srcpkgs/xfsprogs/xfsprogs-libs.template       |  2 +-
 srcpkgs/xfsprogs/xfsprogs.rshlibs             |  7 +++++
 srcpkgs/xmlcatmgr/template                    |  1 +
 srcpkgs/xmlcatmgr/xmlcatmgr.rshlibs           |  1 +
 srcpkgs/xmlto/template                        |  2 +-
 srcpkgs/xmlto/xmlto.rshlibs                   |  1 +
 422 files changed, 1208 insertions(+), 696 deletions(-)
 create mode 100644 srcpkgs/MesaLib/MesaLib.rshlibs
 create mode 100644 srcpkgs/MesaLib/libEGL.rshlibs
 create mode 100644 srcpkgs/MesaLib/libGL.rshlibs
 create mode 100644 srcpkgs/MesaLib/libGLES.rshlibs
 create mode 100644 srcpkgs/MesaLib/libGLU.rshlibs
 create mode 100644 srcpkgs/MesaLib/libGLw.rshlibs
 create mode 100644 srcpkgs/MesaLib/libOpenVG.rshlibs
 create mode 100644 srcpkgs/MesaLib/libglapi.rshlibs
 create mode 100644 srcpkgs/acl/acl-progs.rshlibs
 create mode 100644 srcpkgs/acl/acl.rshlibs
 create mode 100644 srcpkgs/acpid/acpid.rshlibs
 create mode 100644 srcpkgs/atk/atk.rshlibs
 create mode 100644 srcpkgs/attr/attr-progs.rshlibs
 create mode 100644 srcpkgs/attr/attr.rshlibs
 create mode 100644 srcpkgs/bison/bison.rshlibs
 create mode 100644 srcpkgs/bridge-utils/bridge-utils.rshlibs
 create mode 100644 srcpkgs/btrfs-progs/btrfs-progs.rshlibs
 create mode 100644 srcpkgs/cairo/cairo-devel.rshlibs
 create mode 100644 srcpkgs/cairo/cairo.rshlibs
 create mode 100644 srcpkgs/colord/colord.rshlibs
 create mode 100644 srcpkgs/coreutils/coreutils.rshlibs
 create mode 100644 srcpkgs/cracklib/cracklib-python.rshlibs
 create mode 100644 srcpkgs/cracklib/cracklib.rshlibs
 create mode 100644 srcpkgs/curl/curl.rshlibs
 create mode 100644 srcpkgs/curl/libcurl.rshlibs
 create mode 100644 srcpkgs/dash/dash.rshlibs
 create mode 100644 srcpkgs/db/db.rshlibs
 create mode 100644 srcpkgs/db/libdb.rshlibs
 create mode 100644 srcpkgs/dbus/dbus-libs.rshlibs
 create mode 100644 srcpkgs/dbus/dbus-x11.rshlibs
 create mode 100644 srcpkgs/dbus/dbus.rshlibs
 create mode 100644 srcpkgs/dcron/dcron.rshlibs
 create mode 100644 srcpkgs/dhcpcd/dhcpcd.rshlibs
 create mode 100644 srcpkgs/docbook2x/docbook2x.rshlibs
 create mode 100644 srcpkgs/e2fsprogs/e2fsprogs-libs.rshlibs
 create mode 100644 srcpkgs/e2fsprogs/e2fsprogs.rshlibs
 create mode 100644 srcpkgs/ed/ed.rshlibs
 create mode 100644 srcpkgs/eject/eject.rshlibs
 create mode 100644 srcpkgs/expat/expat.rshlibs
 create mode 100644 srcpkgs/findutils/findutils.rshlibs
 create mode 100644 srcpkgs/flex/flex.rshlibs
 create mode 100644 srcpkgs/fontconfig/fontconfig.rshlibs
 create mode 100644 srcpkgs/freetype/freetype.rshlibs
 create mode 100644 srcpkgs/fuse/fuse.rshlibs
 create mode 100644 srcpkgs/gawk/gawk.rshlibs
 create mode 100644 srcpkgs/gdbm/gdbm.rshlibs
 create mode 100644 srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.rshlibs
 create mode 100644 srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
 create mode 100644 srcpkgs/gettext/gettext-libs.rshlibs
 create mode 100644 srcpkgs/gettext/gettext.rshlibs
 create mode 100644 srcpkgs/git/git.rshlibs
 create mode 100644 srcpkgs/glib/glib-devel.rshlibs
 create mode 100644 srcpkgs/glib/glib.rshlibs
 create mode 100644 srcpkgs/gnutls/gnutls-tools.rshlibs
 create mode 100644 srcpkgs/gnutls/gnutls.rshlibs
 create mode 100644 srcpkgs/gobject-introspection/gobject-introspection.rshlibs
 create mode 100644 srcpkgs/gobject-introspection/libgirepository.rshlibs
 create mode 100644 srcpkgs/gperf/gperf.rshlibs
 create mode 100644 srcpkgs/grep/grep.rshlibs
 create mode 100644 srcpkgs/groff/groff.rshlibs
 create mode 100644 srcpkgs/gtk+/gtk+-demo.rshlibs
 create mode 100644 srcpkgs/gtk+/gtk+.rshlibs
 create mode 100644 srcpkgs/gtk+3/gtk+3-demo.rshlibs
 create mode 100644 srcpkgs/gtk+3/gtk+3.rshlibs
 create mode 100644 srcpkgs/ifenslave/ifenslave.rshlibs
 create mode 100644 srcpkgs/iproute2/iproute2.rshlibs
 create mode 100644 srcpkgs/iptables/iptables.rshlibs
 create mode 100644 srcpkgs/iputils/iputils.rshlibs
 create mode 100644 srcpkgs/jpeg/jpeg-tools.rshlibs
 create mode 100644 srcpkgs/jpeg/jpeg.rshlibs
 create mode 100644 srcpkgs/kbd/kbd.rshlibs
 create mode 100644 srcpkgs/lcms2/lcms2.rshlibs
 create mode 100644 srcpkgs/less/less.rshlibs
 create mode 100644 srcpkgs/libICE/libICE.rshlibs
 create mode 100644 srcpkgs/libSM/libSM.rshlibs
 create mode 100644 srcpkgs/libX11/libX11.rshlibs
 create mode 100644 srcpkgs/libXau/libXau.rshlibs
 create mode 100644 srcpkgs/libXcomposite/libXcomposite.rshlibs
 create mode 100644 srcpkgs/libXcursor/libXcursor.rshlibs
 create mode 100644 srcpkgs/libXdamage/libXdamage.rshlibs
 create mode 100644 srcpkgs/libXdmcp/libXdmcp.rshlibs
 create mode 100644 srcpkgs/libXext/libXext.rshlibs
 create mode 100644 srcpkgs/libXfixes/libXfixes.rshlibs
 create mode 100644 srcpkgs/libXft/libXft.rshlibs
 create mode 100644 srcpkgs/libXi/libXi.rshlibs
 create mode 100644 srcpkgs/libXinerama/libXinerama.rshlibs
 create mode 100644 srcpkgs/libXrandr/libXrandr.rshlibs
 create mode 100644 srcpkgs/libXrender/libXrender.rshlibs
 create mode 100644 srcpkgs/libXt/libXt.rshlibs
 create mode 100644 srcpkgs/libXxf86vm/libXxf86vm.rshlibs
 create mode 100644 srcpkgs/libarchive/bsdcpio.rshlibs
 create mode 100644 srcpkgs/libarchive/bsdtar.rshlibs
 create mode 100644 srcpkgs/libarchive/libarchive.rshlibs
 create mode 100644 srcpkgs/libcap/libcap-pam.rshlibs
 create mode 100644 srcpkgs/libcap/libcap-progs.rshlibs
 create mode 100644 srcpkgs/libcap/libcap.rshlibs
 create mode 100644 srcpkgs/libdrm/libdrm.rshlibs
 create mode 100644 srcpkgs/libfetch/libfetch.rshlibs
 create mode 100644 srcpkgs/libffi/libffi.rshlibs
 create mode 100644 srcpkgs/libgcrypt/libgcrypt-devel.rshlibs
 create mode 100644 srcpkgs/libgcrypt/libgcrypt.rshlibs
 create mode 100644 srcpkgs/libgpg-error/libgpg-error.rshlibs
 create mode 100644 srcpkgs/libgudev/libgudev.rshlibs
 create mode 100644 srcpkgs/libidn/libidn.rshlibs
 create mode 100644 srcpkgs/libldap/libldap.rshlibs
 create mode 100644 srcpkgs/libnl/libnl.rshlibs
 create mode 100644 srcpkgs/libnotify/libnotify.rshlibs
 create mode 100644 srcpkgs/libpciaccess/libpciaccess.rshlibs
 create mode 100644 srcpkgs/libpipeline/libpipeline.rshlibs
 create mode 100644 srcpkgs/libpng/libpng.rshlibs
 create mode 100644 srcpkgs/libsasl/libsasl.rshlibs
 create mode 100644 srcpkgs/libtasn1/libtasn1-tools.rshlibs
 create mode 100644 srcpkgs/libtasn1/libtasn1.rshlibs
 create mode 100644 srcpkgs/libtool/libltdl.rshlibs
 create mode 100644 srcpkgs/libusb-compat/libusb-compat.rshlibs
 create mode 100644 srcpkgs/libusb/libusb.rshlibs
 create mode 100644 srcpkgs/libxcb/libxcb.rshlibs
 create mode 100644 srcpkgs/libxml2/libxml2-python.rshlibs
 create mode 100644 srcpkgs/libxml2/libxml2.rshlibs
 create mode 100644 srcpkgs/libxslt/libxslt-python.rshlibs
 create mode 100644 srcpkgs/libxslt/libxslt.rshlibs
 create mode 100644 srcpkgs/llvm/clang.rshlibs
 create mode 100644 srcpkgs/llvm/libclang.rshlibs
 create mode 100644 srcpkgs/llvm/libllvm.rshlibs
 create mode 100644 srcpkgs/llvm/llvm.rshlibs
 create mode 100644 srcpkgs/logrotate/logrotate.rshlibs
 create mode 100644 srcpkgs/lzo/lzo.rshlibs
 create mode 100644 srcpkgs/makedepend/makedepend.rshlibs
 create mode 100644 srcpkgs/man-db/man-db.rshlibs
 create mode 100644 srcpkgs/mercurial/mercurial.rshlibs
 create mode 100644 srcpkgs/mit-krb5/mit-krb5-client.rshlibs
 create mode 100644 srcpkgs/mit-krb5/mit-krb5-libs.rshlibs
 create mode 100644 srcpkgs/mit-krb5/mit-krb5.rshlibs
 create mode 100644 srcpkgs/module-init-tools/module-init-tools.rshlibs
 create mode 100644 srcpkgs/mysql/libmysqlclient.rshlibs
 create mode 100644 srcpkgs/mysql/libndbclient.rshlibs
 create mode 100644 srcpkgs/mysql/mysql-client.rshlibs
 create mode 100644 srcpkgs/mysql/mysql-ndb.rshlibs
 create mode 100644 srcpkgs/mysql/mysql.rshlibs
 create mode 100644 srcpkgs/ntfs-3g/ntfs-3g.rshlibs
 create mode 100644 srcpkgs/ntp/ntp.rshlibs
 create mode 100644 srcpkgs/openssh/openssh-client.rshlibs
 create mode 100644 srcpkgs/openssh/openssh-server.rshlibs
 create mode 100644 srcpkgs/openssh/openssh.rshlibs
 create mode 100644 srcpkgs/openssl/libssl.rshlibs
 create mode 100644 srcpkgs/openssl/openssl.rshlibs
 create mode 100644 srcpkgs/pam/pam-userdb.rshlibs
 create mode 100644 srcpkgs/pam/pam.rshlibs
 create mode 100644 srcpkgs/pango/pango.rshlibs
 create mode 100644 srcpkgs/pciutils/pciutils.rshlibs
 create mode 100644 srcpkgs/pcre/libpcre.rshlibs
 create mode 100644 srcpkgs/pcre/pcre.rshlibs
 create mode 100644 srcpkgs/perl-XML-Parser/perl-XML-Parser.rshlibs
 create mode 100644 srcpkgs/perl/perl.rshlibs
 create mode 100644 srcpkgs/pixman/pixman.rshlibs
 create mode 100644 srcpkgs/pkg-config/pkg-config.rshlibs
 create mode 100644 srcpkgs/polkit/polkit.rshlibs
 create mode 100644 srcpkgs/popt/popt.rshlibs
 create mode 100644 srcpkgs/postgresql/postgresql-client.rshlibs
 create mode 100644 srcpkgs/postgresql/postgresql-libs-devel.rshlibs
 create mode 100644 srcpkgs/postgresql/postgresql-libs.rshlibs
 create mode 100644 srcpkgs/postgresql/postgresql-plperl.rshlibs
 create mode 100644 srcpkgs/postgresql/postgresql-plpython.rshlibs
 create mode 100644 srcpkgs/postgresql/postgresql-pltcl.rshlibs
 create mode 100644 srcpkgs/postgresql/postgresql.rshlibs
 create mode 100644 srcpkgs/procps/procps.rshlibs
 create mode 100644 srcpkgs/proplib/proplib.rshlibs
 create mode 100644 srcpkgs/psmisc/psmisc.rshlibs
 create mode 100644 srcpkgs/python/python.rshlibs
 create mode 100644 srcpkgs/readline/readline.rshlibs
 create mode 100644 srcpkgs/rsyslog/rsyslog-gnutls.rshlibs
 create mode 100644 srcpkgs/rsyslog/rsyslog-gssapi.rshlibs
 create mode 100644 srcpkgs/rsyslog/rsyslog-mysql.rshlibs
 create mode 100644 srcpkgs/rsyslog/rsyslog-postgresql.rshlibs
 create mode 100644 srcpkgs/rsyslog/rsyslog.rshlibs
 create mode 100644 srcpkgs/sed/sed.rshlibs
 create mode 100644 srcpkgs/shadow/shadow.rshlibs
 create mode 100644 srcpkgs/sqlite/sqlite-tcl.rshlibs
 create mode 100644 srcpkgs/sqlite/sqlite.rshlibs
 create mode 100644 srcpkgs/sudo/sudo.rshlibs
 create mode 100644 srcpkgs/sysfsutils/libsysfs.rshlibs
 create mode 100644 srcpkgs/sysfsutils/sysfsutils.rshlibs
 create mode 100644 srcpkgs/systemd/systemd-admin.rshlibs
 create mode 100644 srcpkgs/systemd/systemd-gnome-passwd-agent.rshlibs
 create mode 100644 srcpkgs/systemd/systemd.rshlibs
 create mode 100644 srcpkgs/talloc/talloc.rshlibs
 create mode 100644 srcpkgs/tcl/tcl.rshlibs
 create mode 100644 srcpkgs/tcp_wrappers/tcp_wrappers-libs.rshlibs
 create mode 100644 srcpkgs/tcp_wrappers/tcp_wrappers.rshlibs
 create mode 100644 srcpkgs/texinfo/texinfo.rshlibs
 create mode 100644 srcpkgs/tiff/tiff.rshlibs
 create mode 100644 srcpkgs/tzdata/tzdata.rshlibs
 create mode 100644 srcpkgs/udev/libudev.rshlibs
 create mode 100644 srcpkgs/udev/udev.rshlibs
 create mode 100644 srcpkgs/usbutils/usbutils.rshlibs
 create mode 100644 srcpkgs/util-linux/libblkid.rshlibs
 create mode 100644 srcpkgs/util-linux/libmount.rshlibs
 create mode 100644 srcpkgs/util-linux/libuuid.rshlibs
 create mode 100644 srcpkgs/util-linux/util-linux.rshlibs
 create mode 100644 srcpkgs/vala/libvala.rshlibs
 create mode 100644 srcpkgs/vala/vala.rshlibs
 create mode 100644 srcpkgs/vim/vim.rshlibs
 create mode 100644 srcpkgs/wget/wget.rshlibs
 create mode 100644 srcpkgs/which/which.rshlibs
 create mode 100644 srcpkgs/wireless_tools/wireless_tools.rshlibs
 create mode 100644 srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs
 create mode 100644 srcpkgs/xbps/xbps.rshlibs
 create mode 100644 srcpkgs/xfsprogs/xfsprogs-libs.rshlibs
 create mode 100644 srcpkgs/xfsprogs/xfsprogs.rshlibs
 create mode 100644 srcpkgs/xmlcatmgr/xmlcatmgr.rshlibs
 create mode 100644 srcpkgs/xmlto/xmlto.rshlibs

diff --git a/srcpkgs/MesaLib/MesaLib.rshlibs b/srcpkgs/MesaLib/MesaLib.rshlibs
new file mode 100644
index 0000000000..2154c07867
--- /dev/null
+++ b/srcpkgs/MesaLib/MesaLib.rshlibs
@@ -0,0 +1,11 @@
+libpthread.so.0
+libdl.so.2
+libc.so.6
+libdrm.so.2
+libexpat.so.1
+libm.so.6
+libgcc_s.so.1
+libstdc++.so.6
+libdrm_intel.so.1
+libdrm_nouveau.so.1
+libdrm_radeon.so.1
diff --git a/srcpkgs/MesaLib/libEGL.rshlibs b/srcpkgs/MesaLib/libEGL.rshlibs
new file mode 100644
index 0000000000..2b369f2f24
--- /dev/null
+++ b/srcpkgs/MesaLib/libEGL.rshlibs
@@ -0,0 +1,18 @@
+libdl.so.2
+libpthread.so.0
+libX11-xcb.so.1
+libX11.so.6
+libxcb-dri2.so.0
+libxcb-xfixes.so.0
+libxcb.so.1
+libdrm.so.2
+libc.so.6
+libOpenVG.so.1
+libXext.so.6
+libXfixes.so.3
+libdrm_nouveau.so.1
+libglapi.so.0
+libm.so.6
+libudev.so.0
+libstdc++.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/MesaLib/libEGL.template b/srcpkgs/MesaLib/libEGL.template
index af1b94211d..7ac6ecb213 100644
--- a/srcpkgs/MesaLib/libEGL.template
+++ b/srcpkgs/MesaLib/libEGL.template
@@ -11,19 +11,8 @@ long_desc="
  to provide hardware-accelerated OpenGL|ES and OpenVG support."
 
 replaces="MesaLib<7.11_2"
-revision=1
+revision=2
 
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run libxcb
-Add_dependency run libdrm
-Add_dependency run libOpenVG
-Add_dependency run libXext
-Add_dependency run libXfixes
-Add_dependency run libglapi
-Add_dependency run libudev
-Add_dependency run libstdc++
-Add_dependency run libgcc
 
 do_install() {
 	vmove "usr/lib/libEGL*.so*" usr/lib
diff --git a/srcpkgs/MesaLib/libGL.rshlibs b/srcpkgs/MesaLib/libGL.rshlibs
new file mode 100644
index 0000000000..8c2f65ff01
--- /dev/null
+++ b/srcpkgs/MesaLib/libGL.rshlibs
@@ -0,0 +1,13 @@
+libglapi.so.0
+libXext.so.6
+libXdamage.so.1
+libXfixes.so.3
+libXxf86vm.so.1
+libX11-xcb.so.1
+libX11.so.6
+libxcb-glx.so.0
+libxcb.so.1
+libdrm.so.2
+libpthread.so.0
+libdl.so.2
+libc.so.6
diff --git a/srcpkgs/MesaLib/libGL.template b/srcpkgs/MesaLib/libGL.template
index 9ef3307423..d6d966e06d 100644
--- a/srcpkgs/MesaLib/libGL.template
+++ b/srcpkgs/MesaLib/libGL.template
@@ -10,17 +10,8 @@ long_desc="
  the MesaLib package."
 
 replaces="MesaLib<7.11_2"
-revision=1
+revision=2
 
-Add_dependency run glibc
-Add_dependency run libglapi
-Add_dependency run libXext
-Add_dependency run libXdamage
-Add_dependency run libXfixes
-Add_dependency run libXxf86vm
-Add_dependency run libX11
-Add_dependency run libxcb
-Add_dependency run libdrm
 
 do_install() {
 	vmove "usr/lib/libGL.so*" usr/lib
diff --git a/srcpkgs/MesaLib/libGLES.rshlibs b/srcpkgs/MesaLib/libGLES.rshlibs
new file mode 100644
index 0000000000..58436e7995
--- /dev/null
+++ b/srcpkgs/MesaLib/libGLES.rshlibs
@@ -0,0 +1,2 @@
+libglapi.so.0
+libc.so.6
diff --git a/srcpkgs/MesaLib/libGLES.template b/srcpkgs/MesaLib/libGLES.template
index 8c1e4de8b7..9609cf7252 100644
--- a/srcpkgs/MesaLib/libGLES.template
+++ b/srcpkgs/MesaLib/libGLES.template
@@ -12,10 +12,8 @@ long_desc="
  and fragment shaders."
 
 replaces="MesaLib<7.11_2"
-revision=1
+revision=2
 
-Add_dependency run glibc
-Add_dependency run libglapi
 
 do_install() {
 	vmove "usr/lib/libGLES*.so*" usr/lib
diff --git a/srcpkgs/MesaLib/libGLU.rshlibs b/srcpkgs/MesaLib/libGLU.rshlibs
new file mode 100644
index 0000000000..f44146ccc7
--- /dev/null
+++ b/srcpkgs/MesaLib/libGLU.rshlibs
@@ -0,0 +1,5 @@
+libGL.so.1
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
+libc.so.6
diff --git a/srcpkgs/MesaLib/libGLU.template b/srcpkgs/MesaLib/libGLU.template
index fb107679ef..e1c01604a0 100644
--- a/srcpkgs/MesaLib/libGLU.template
+++ b/srcpkgs/MesaLib/libGLU.template
@@ -10,12 +10,8 @@ long_desc="
  unprojecting screen coordinates to world coordinates."
 
 replaces="MesaLib<7.11_2"
-revision=1
+revision=2
 
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libstdc++
-Add_dependency run libGL
 
 do_install() {
 	vmove "usr/lib/libGLU.so*" usr/lib
diff --git a/srcpkgs/MesaLib/libGLw.rshlibs b/srcpkgs/MesaLib/libGLw.rshlibs
new file mode 100644
index 0000000000..e2ede87719
--- /dev/null
+++ b/srcpkgs/MesaLib/libGLw.rshlibs
@@ -0,0 +1,4 @@
+libGL.so.1
+libXt.so.6
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/MesaLib/libGLw.template b/srcpkgs/MesaLib/libGLw.template
index 59ab773ce9..a78d2c844c 100644
--- a/srcpkgs/MesaLib/libGLw.template
+++ b/srcpkgs/MesaLib/libGLw.template
@@ -12,12 +12,8 @@ long_desc="
  Motif-based applications to embed an OpenGL drawing context."
 
 replaces="MesaLib<7.11_2"
-revision=1
+revision=2
 
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run libXt
-Add_dependency run libGL
 
 do_install() {
 	vmove "usr/lib/libGLw.so*" usr/lib
diff --git a/srcpkgs/MesaLib/libOpenVG.rshlibs b/srcpkgs/MesaLib/libOpenVG.rshlibs
new file mode 100644
index 0000000000..5c5d2ae913
--- /dev/null
+++ b/srcpkgs/MesaLib/libOpenVG.rshlibs
@@ -0,0 +1,2 @@
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/MesaLib/libOpenVG.template b/srcpkgs/MesaLib/libOpenVG.template
index 23df442a8a..8f6f24ce61 100644
--- a/srcpkgs/MesaLib/libOpenVG.template
+++ b/srcpkgs/MesaLib/libOpenVG.template
@@ -9,9 +9,8 @@ long_desc="
  watches to full microprocessor-based desktop and server machines."
 
 replaces="MesaLib<7.11_2"
-revision=1
+revision=2
 
-Add_dependency run glibc
 
 do_install() {
 	vmove "usr/lib/libOpenVG.so*" usr/lib
diff --git a/srcpkgs/MesaLib/libglapi.rshlibs b/srcpkgs/MesaLib/libglapi.rshlibs
new file mode 100644
index 0000000000..5c5d2ae913
--- /dev/null
+++ b/srcpkgs/MesaLib/libglapi.rshlibs
@@ -0,0 +1,2 @@
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/MesaLib/libglapi.template b/srcpkgs/MesaLib/libglapi.template
index b740fd1361..b982d75b9a 100644
--- a/srcpkgs/MesaLib/libglapi.template
+++ b/srcpkgs/MesaLib/libglapi.template
@@ -6,9 +6,8 @@ long_desc="
  It is intended to be mainly used by both the libGLES package."
 
 replaces="MesaLib<7.11_2"
-revision=1
+revision=2
 
-Add_dependency run glibc
 
 do_install() {
 	vmove "usr/lib/libglapi.so*" usr/lib
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index 9eebfef522..f3757cfe13 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,7 +1,7 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
 version=7.11
-revision=2
+revision=3
 wrksrc="Mesa-${version}"
 distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
@@ -25,11 +25,6 @@ long_desc="
 subpackages="libEGL libglapi libGLES libGL libGLU libGLw libOpenVG"
 subpackages="${subpackages} ${pkgname}-devel"
 
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libstdc++
-Add_dependency run expat
-Add_dependency run libdrm
 
 Add_dependency build perl		">=0"
 Add_dependency build flex
diff --git a/srcpkgs/acl/acl-progs.rshlibs b/srcpkgs/acl/acl-progs.rshlibs
new file mode 100644
index 0000000000..600d48bacf
--- /dev/null
+++ b/srcpkgs/acl/acl-progs.rshlibs
@@ -0,0 +1,2 @@
+libacl.so.1
+libc.so.6
diff --git a/srcpkgs/acl/acl-progs.template b/srcpkgs/acl/acl-progs.template
index 6e7f2b0042..967cbe3799 100644
--- a/srcpkgs/acl/acl-progs.template
+++ b/srcpkgs/acl/acl-progs.template
@@ -1,13 +1,12 @@
 # Template file for 'acl-progs'.
 #
+revision=1
 short_desc="${short_desc} (utilities)"
 long_desc="${long_desc}
 
  This package contains binary utilities provided by the acl package."
 
-Add_dependency run glibc
 Add_dependency run attr
-Add_dependency run acl
 
 do_install()
 {
diff --git a/srcpkgs/acl/acl.rshlibs b/srcpkgs/acl/acl.rshlibs
new file mode 100644
index 0000000000..625c5030c1
--- /dev/null
+++ b/srcpkgs/acl/acl.rshlibs
@@ -0,0 +1,2 @@
+libattr.so.1
+libc.so.6
diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index 4bb403e977..52acdaa8b6 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
 make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr
  PKG_MAN_DIR=$XBPS_DESTDIR/$pkgname-$version/usr/share/man install
  install-lib install-dev"
+revision=1
 short_desc="Access Control List filesystem support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://savannah.nongnu.org/projects/acl"
@@ -17,8 +18,6 @@ long_desc="
 
 keep_libtool_archives=yes
 subpackages="acl-devel acl-progs"
-Add_dependency run glibc
-Add_dependency run attr
 Add_dependency build gettext
 Add_dependency build gawk
 Add_dependency build attr-devel
diff --git a/srcpkgs/acpid/acpid.rshlibs b/srcpkgs/acpid/acpid.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/acpid/acpid.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index fdef7486ad..bafcc172ed 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,7 +1,7 @@
 # Template file for 'acpid'
 pkgname=acpid
 version=2.0.12
-revision=2
+revision=3
 homepage="http://tedfelix.com/linux/acpid-netlink.html"
 distfiles="http://tedfelix.com/linux/acpid-$version.tar.gz"
 build_style=gnu-makefile
@@ -18,7 +18,6 @@ long_desc="
 
 systemd_services="acpid.service on"
 conf_files="/etc/conf.d/acpid"
-Add_dependency run glibc
 
 post_install()
 {
diff --git a/srcpkgs/atk/atk.rshlibs b/srcpkgs/atk/atk.rshlibs
new file mode 100644
index 0000000000..9ba5b3529a
--- /dev/null
+++ b/srcpkgs/atk/atk.rshlibs
@@ -0,0 +1,6 @@
+libgobject-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index 1654dd2881..e6a19c0fae 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -3,6 +3,7 @@ pkgname=atk
 version=2.2.0
 distfiles="${GNOME_SITE}/atk/2.2/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+revision=1
 short_desc="Set of interfaces for accessibility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -21,8 +22,6 @@ long_desc="
  additional accessibility information to assistive technology tools."
 
 subpackages="atk-devel"
-Add_dependency run glibc
-Add_dependency run glib
 Add_dependency build pkg-config
 Add_dependency build glib-devel
 Add_dependency build gobject-introspection
diff --git a/srcpkgs/attr/attr-progs.rshlibs b/srcpkgs/attr/attr-progs.rshlibs
new file mode 100644
index 0000000000..625c5030c1
--- /dev/null
+++ b/srcpkgs/attr/attr-progs.rshlibs
@@ -0,0 +1,2 @@
+libattr.so.1
+libc.so.6
diff --git a/srcpkgs/attr/attr-progs.template b/srcpkgs/attr/attr-progs.template
index 62cdf12530..5f88d3f428 100644
--- a/srcpkgs/attr/attr-progs.template
+++ b/srcpkgs/attr/attr-progs.template
@@ -1,12 +1,11 @@
 # Template file for 'attr-progs'.
 #
+revision=1
 short_desc="${short_desc} (utilities)"
 long_desc="${long_desc}
 
  This package contains binary utilities provided by the attr package."
 
-Add_dependency run glibc
-Add_dependency run attr
 
 do_install()
 {
diff --git a/srcpkgs/attr/attr.rshlibs b/srcpkgs/attr/attr.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/attr/attr.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template
index df34b38870..47f9d0e01d 100644
--- a/srcpkgs/attr/template
+++ b/srcpkgs/attr/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
 make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr
  PKG_MAN_DIR=$XBPS_DESTDIR/$pkgname-$version/usr/share/man install
  install-lib install-dev"
+revision=1
 short_desc="Extended attribute support library for ACL support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://savannah.nongnu.org/projects/attr"
@@ -18,7 +19,6 @@ keep_libtool_archives=yes
 subpackages="attr-devel attr-progs"
 Add_dependency build gettext
 Add_dependency build gawk
-Add_dependency run glibc
 
 post_install()
 {
diff --git a/srcpkgs/bison/bison.rshlibs b/srcpkgs/bison/bison.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/bison/bison.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template
index e74d352700..2ec24cf77b 100644
--- a/srcpkgs/bison/template
+++ b/srcpkgs/bison/template
@@ -3,6 +3,7 @@ pkgname=bison
 version=2.5
 distfiles="http://ftp.gnu.org/pub/gnu/bison/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="GNU yacc(1) replacement"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0a370df6ee2b23e9ec3043e1ab78878241aa008ec424926294dd4cb3475439b8
diff --git a/srcpkgs/bridge-utils/bridge-utils.rshlibs b/srcpkgs/bridge-utils/bridge-utils.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/bridge-utils/bridge-utils.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/bridge-utils/template b/srcpkgs/bridge-utils/template
index 09bbfe292a..8e406f414e 100644
--- a/srcpkgs/bridge-utils/template
+++ b/srcpkgs/bridge-utils/template
@@ -4,6 +4,7 @@ version=1.5
 homepage="http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge"
 distfiles="${SOURCEFORGE_SITE}/bridge/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="Layer2 ethernet bridging for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -16,7 +17,6 @@ long_desc="
 
  The Linux bridge code implements a subset of the ANSI/IEEE 802.1d standard."
 
-Add_dependency run glibc
 Add_dependency build automake
 
 pre_configure()
diff --git a/srcpkgs/btrfs-progs/btrfs-progs.rshlibs b/srcpkgs/btrfs-progs/btrfs-progs.rshlibs
new file mode 100644
index 0000000000..d0dcd0e300
--- /dev/null
+++ b/srcpkgs/btrfs-progs/btrfs-progs.rshlibs
@@ -0,0 +1,2 @@
+libuuid.so.1
+libc.so.6
diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 72620c11aa..3b23fe0d2f 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -5,6 +5,7 @@ distfiles="http://xbps.nopcode.org/distfiles/$pkgname-$version.tar.gz"
 build_style=gnu-makefile
 make_build_args="CFLAGS=-Wno-error"
 make_install_args="prefix=/usr bindir=/sbin mandir=/usr/share/man"
+revision=1
 short_desc="Btrfs filesystem utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=70683c522931eb8b96a68950cc9d95e64d6e350488f2797ca1c2be32bd32f902
@@ -12,6 +13,4 @@ long_desc="
  This packages provides the userspace utilities required to
  create/format/manipulate Btrfs filesystems."
 
-Add_dependency run glibc
-Add_dependency run libuuid
 Add_dependency build libuuid-devel
diff --git a/srcpkgs/cairo/cairo-devel.rshlibs b/srcpkgs/cairo/cairo-devel.rshlibs
new file mode 100644
index 0000000000..43b3d86cfb
--- /dev/null
+++ b/srcpkgs/cairo/cairo-devel.rshlibs
@@ -0,0 +1,5 @@
+libpthread.so.0
+libz.so.1
+libdl.so.2
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/cairo/cairo-devel.template b/srcpkgs/cairo/cairo-devel.template
index 6a5810f15a..127c93f13f 100644
--- a/srcpkgs/cairo/cairo-devel.template
+++ b/srcpkgs/cairo/cairo-devel.template
@@ -5,10 +5,8 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=6
+revision=7
 
-Add_dependency run glibc
-Add_dependency run zlib
 Add_dependency run cairo
 Add_dependency run freetype-devel
 Add_dependency run fontconfig-devel
diff --git a/srcpkgs/cairo/cairo.rshlibs b/srcpkgs/cairo/cairo.rshlibs
new file mode 100644
index 0000000000..6aa9e3e0f3
--- /dev/null
+++ b/srcpkgs/cairo/cairo.rshlibs
@@ -0,0 +1,19 @@
+libpthread.so.0
+libpixman-1.so.0
+libfontconfig.so.1
+libfreetype.so.6
+libEGL.so.1
+libpng14.so.14
+libxcb-shm.so.0
+libxcb-render.so.0
+libxcb.so.1
+libXrender.so.1
+libX11.so.6
+libz.so.1
+libGL.so.1
+libgobject-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libglib-2.0.so.0
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 76a4139cd4..344c05a312 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -1,7 +1,7 @@
 # Template build file for 'cairo'.
 pkgname=cairo
 version=1.10.2
-revision=5
+revision=6
 homepage="http://cairographics.org"
 distfiles="${homepage}/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -25,18 +25,6 @@ long_desc="
  antialiased text rendering."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run fontconfig
-Add_dependency run freetype
-Add_dependency run pixman
-Add_dependency run glib
-Add_dependency run libpng
-Add_dependency run libxcb
-Add_dependency run libX11
-Add_dependency run libXrender
-Add_dependency run libGL
-Add_dependency run libEGL
 
 Add_dependency build pkg-config
 Add_dependency build zlib-devel
diff --git a/srcpkgs/colord/colord.rshlibs b/srcpkgs/colord/colord.rshlibs
new file mode 100644
index 0000000000..4480dbb221
--- /dev/null
+++ b/srcpkgs/colord/colord.rshlibs
@@ -0,0 +1,14 @@
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+liblcms2.so.2
+libm.so.6
+libsqlite3.so.0
+libpolkit-gobject-1.so.0
+libgudev-1.0.so.0
+libusb-1.0.so.0
+libgio-2.0.so.0
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index c74a31c41a..43e1219dda 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -1,7 +1,7 @@
 # Template file for 'colord'
 pkgname=colord
 version=0.1.13
-revision=2
+revision=3
 homepage="http://www.freedesktop.org/software/colord"
 distfiles="$homepage/releases/$pkgname-$version.tar.xz"
 build_style=gnu-configure
@@ -27,13 +27,6 @@ long_desc="
 conf_files="/etc/colord.conf"
 subpackages="$pkgname-devel"
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run lcms2
-Add_dependency run sqlite
-Add_dependency run polkit
-Add_dependency run libgudev
-Add_dependency run libusb
 Add_dependency run dbus
 
 Add_dependency build pkg-config
diff --git a/srcpkgs/coreutils/coreutils.rshlibs b/srcpkgs/coreutils/coreutils.rshlibs
new file mode 100644
index 0000000000..c7759e0919
--- /dev/null
+++ b/srcpkgs/coreutils/coreutils.rshlibs
@@ -0,0 +1,7 @@
+libc.so.6
+librt.so.1
+libgmp.so.10
+libcap.so.2
+libacl.so.1
+libpthread.so.0
+libattr.so.1
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index c2f97226d6..31f4954eb6 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -4,6 +4,7 @@ version=8.14
 distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-install-program=hostname --bindir=/bin"
+revision=1
 short_desc="The GNU core utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/coreutils"
@@ -14,11 +15,6 @@ long_desc="
  utilities of the GNU operating system. These are the core utilities
  which are expected to exist on every operating system."
 
-Add_dependency run glibc
-Add_dependency run gmp
-Add_dependency run attr
-Add_dependency run acl
-Add_dependency run libcap
 
 Add_dependency build perl
 Add_dependency build gmp-devel
diff --git a/srcpkgs/cracklib/cracklib-python.rshlibs b/srcpkgs/cracklib/cracklib-python.rshlibs
new file mode 100644
index 0000000000..04967238a6
--- /dev/null
+++ b/srcpkgs/cracklib/cracklib-python.rshlibs
@@ -0,0 +1,3 @@
+libcrack.so.2
+libz.so.1
+libc.so.6
diff --git a/srcpkgs/cracklib/cracklib-python.template b/srcpkgs/cracklib/cracklib-python.template
index 13e08957a8..74b3f1f7b0 100644
--- a/srcpkgs/cracklib/cracklib-python.template
+++ b/srcpkgs/cracklib/cracklib-python.template
@@ -5,13 +5,10 @@ long_desc="${long_desc}
 
  This package contains python bindings for cracklib."
 
-revision=2
+revision=3
 pycompile_module="."
 
-Add_dependency run glibc
-Add_dependency run zlib
 Add_dependency run python
-Add_dependency run cracklib
 
 do_install()
 {
diff --git a/srcpkgs/cracklib/cracklib.rshlibs b/srcpkgs/cracklib/cracklib.rshlibs
new file mode 100644
index 0000000000..1a1d79f63f
--- /dev/null
+++ b/srcpkgs/cracklib/cracklib.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libz.so.1
diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template
index 48a7649c31..7c080280f1 100644
--- a/srcpkgs/cracklib/template
+++ b/srcpkgs/cracklib/template
@@ -3,6 +3,7 @@ pkgname=cracklib
 version=2.8.18
 distfiles="${SOURCEFORGE_SITE}/cracklib/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="Password Checking Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2b072f67f7267358459424c3ed70f7f5b70919118e6504a90d3bce37a67c1454
@@ -12,8 +13,6 @@ long_desc="
  dictionary attacks)."
 
 subpackages="$pkgname-devel $pkgname-python"
-Add_dependency run glibc
-Add_dependency run zlib
 Add_dependency build gettext
 Add_dependency build python-devel
 Add_dependency build zlib-devel
diff --git a/srcpkgs/curl/curl.rshlibs b/srcpkgs/curl/curl.rshlibs
new file mode 100644
index 0000000000..10619d50c1
--- /dev/null
+++ b/srcpkgs/curl/curl.rshlibs
@@ -0,0 +1,4 @@
+libcurl.so.4
+librt.so.1
+libz.so.1
+libc.so.6
diff --git a/srcpkgs/curl/libcurl.rshlibs b/srcpkgs/curl/libcurl.rshlibs
new file mode 100644
index 0000000000..6225508aa5
--- /dev/null
+++ b/srcpkgs/curl/libcurl.rshlibs
@@ -0,0 +1,13 @@
+libidn.so.11
+libldap-2.4.so.2
+librt.so.1
+libgssapi_krb5.so.2
+libkrb5.so.3
+libk5crypto.so.3
+libcom_err.so.2
+libresolv.so.2
+libssl.so.1
+libcrypto.so.1
+libdl.so.2
+libz.so.1
+libc.so.6
diff --git a/srcpkgs/curl/libcurl.template b/srcpkgs/curl/libcurl.template
index 62b2f35b5a..941ba76b1c 100644
--- a/srcpkgs/curl/libcurl.template
+++ b/srcpkgs/curl/libcurl.template
@@ -1,5 +1,6 @@
 # Template file for 'libcurl'.
 #
+revision=1
 short_desc="The multiprotocol file transfer library"
 long_desc="
  libcurl is a free and easy-to-use client-side URL transfer library,
@@ -11,13 +12,6 @@ long_desc="
 
 replaces="curl-libs<7.20.1"
 
-Add_dependency run glibc
-Add_dependency run libidn
-Add_dependency run zlib
-Add_dependency run libssl
-Add_dependency run libldap
-Add_dependency run mit-krb5-libs
-Add_dependency run e2fsprogs-libs
 
 do_install()
 {
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 20c22c20a3..b18637d409 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -6,6 +6,7 @@ distfiles="$homepage/download/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ldaps --with-gssapi=/usr \
 	--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+revision=1
 short_desc="Client that groks URLs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -20,9 +21,6 @@ long_desc="
 
 subpackages="libcurl libcurl-devel"
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libcurl
 Add_dependency run libidn
 Add_dependency run ca-certificates
 
diff --git a/srcpkgs/dash/dash.rshlibs b/srcpkgs/dash/dash.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/dash/dash.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index e91d7abd70..20a72131eb 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -4,6 +4,7 @@ version=0.5.7
 distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--exec-prefix= LANG=C"
+revision=1
 short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gondor.apana.org.au/~herbert/dash/"
@@ -18,7 +19,6 @@ long_desc="
  dash in 2002."
 
 register_shell="/bin/sh"
-Add_dependency run glibc
 Add_dependency run coreutils
 Add_dependency build bison
 Add_dependency build coreutils
diff --git a/srcpkgs/db/db.rshlibs b/srcpkgs/db/db.rshlibs
new file mode 100644
index 0000000000..a707e886d6
--- /dev/null
+++ b/srcpkgs/db/db.rshlibs
@@ -0,0 +1,3 @@
+libdb-4.8.so
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/db/libdb.rshlibs b/srcpkgs/db/libdb.rshlibs
new file mode 100644
index 0000000000..5d3c9f034b
--- /dev/null
+++ b/srcpkgs/db/libdb.rshlibs
@@ -0,0 +1,5 @@
+libpthread.so.0
+libc.so.6
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/db/libdb.template b/srcpkgs/db/libdb.template
index 07125b64c6..6776957c8b 100644
--- a/srcpkgs/db/libdb.template
+++ b/srcpkgs/db/libdb.template
@@ -1,5 +1,6 @@
 # Template file for 'libdb'.
 #
+revision=1
 short_desc="${short_desc} - shared libraries"
 long_desc="${long_desc}
 
@@ -7,9 +8,6 @@ long_desc="${long_desc}
 
 replaces="db<4.8.26"
 
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libstdc++
 
 do_install()
 {
diff --git a/srcpkgs/db/template b/srcpkgs/db/template
index cf2ba447cc..687e16adea 100644
--- a/srcpkgs/db/template
+++ b/srcpkgs/db/template
@@ -1,7 +1,7 @@
 # Template file for 'db'
 pkgname=db
 version=4.8.26
-revision=1
+revision=2
 wrksrc="db-${version}"
 distfiles="http://download-uk.oracle.com/berkeley-db/db-${version}.tar.gz"
 build_style=gnu-configure
@@ -39,8 +39,6 @@ long_desc="
    database."
 
 subpackages="libdb db-docs db-devel"
-Add_dependency run glibc
-Add_dependency run libdb
 
 post_install()
 {
diff --git a/srcpkgs/dbus/dbus-libs.rshlibs b/srcpkgs/dbus/dbus-libs.rshlibs
new file mode 100644
index 0000000000..8931f3cfa5
--- /dev/null
+++ b/srcpkgs/dbus/dbus-libs.rshlibs
@@ -0,0 +1,3 @@
+libpthread.so.0
+librt.so.1
+libc.so.6
diff --git a/srcpkgs/dbus/dbus-libs.template b/srcpkgs/dbus/dbus-libs.template
index 6a3b2d0d85..9d4b682bfd 100644
--- a/srcpkgs/dbus/dbus-libs.template
+++ b/srcpkgs/dbus/dbus-libs.template
@@ -1,11 +1,11 @@
 # Template file for 'dbus-libs'.
 #
+revision=1
 short_desc="${short_desc} (shared libraries)"
 long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-Add_dependency run glibc
 
 do_install()
 {
diff --git a/srcpkgs/dbus/dbus-x11.rshlibs b/srcpkgs/dbus/dbus-x11.rshlibs
new file mode 100644
index 0000000000..7d9cf67dc2
--- /dev/null
+++ b/srcpkgs/dbus/dbus-x11.rshlibs
@@ -0,0 +1,3 @@
+libX11.so.6
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/dbus/dbus-x11.template b/srcpkgs/dbus/dbus-x11.template
index edc2170e16..31ad87941c 100644
--- a/srcpkgs/dbus/dbus-x11.template
+++ b/srcpkgs/dbus/dbus-x11.template
@@ -1,5 +1,6 @@
 # Template file for 'dbus-x11'.
 #
+revision=1
 short_desc="${short_desc} (X11 support)"
 long_desc="${long_desc}
 
@@ -8,9 +9,7 @@ long_desc="${long_desc}
 
 replaces="dbus<1.4.16_2"
 
-Add_dependency run glibc
 Add_dependency run dbus-libs
-Add_dependency run libX11
 
 do_install()
 {
diff --git a/srcpkgs/dbus/dbus.rshlibs b/srcpkgs/dbus/dbus.rshlibs
new file mode 100644
index 0000000000..b9c5725fa7
--- /dev/null
+++ b/srcpkgs/dbus/dbus.rshlibs
@@ -0,0 +1,5 @@
+libexpat.so.1
+libpthread.so.0
+librt.so.1
+libc.so.6
+libdbus-1.so.3
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 1539c82a93..31f0326fe0 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'dbus'
 pkgname=dbus
 version=1.4.16
-revision=3
+revision=4
 homepage="http://dbus.freedesktop.org/"
 distfiles="${homepage}/releases/dbus/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -29,9 +29,6 @@ subpackages="dbus-devel dbus-libs dbus-x11"
 systemd_services="dbus.service off"
 system_accounts="dbus"
 
-Add_dependency run glibc
-Add_dependency run expat
-Add_dependency run dbus-libs
 
 Add_dependency build coreutils
 Add_dependency build pkg-config
diff --git a/srcpkgs/dcron/dcron.rshlibs b/srcpkgs/dcron/dcron.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/dcron/dcron.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template
index be0d135c43..36299bf85a 100644
--- a/srcpkgs/dcron/template
+++ b/srcpkgs/dcron/template
@@ -1,7 +1,7 @@
 # Template file for 'dcron'
 pkgname=dcron
 version=4.5
-revision=12
+revision=13
 distfiles="http://www.jimpryor.net/linux/releases/dcron-${version}.tar.gz"
 short_desc="Dillon's lightweight cron daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -21,7 +21,6 @@ conf_files="/var/spool/cron/root"
 provides="cron-daemon-0"
 replaces="cron-daemon>=0"
 
-Add_dependency run glibc
 
 do_build()
 {
diff --git a/srcpkgs/dhcpcd/dhcpcd.rshlibs b/srcpkgs/dhcpcd/dhcpcd.rshlibs
new file mode 100644
index 0000000000..f7df7fcad1
--- /dev/null
+++ b/srcpkgs/dhcpcd/dhcpcd.rshlibs
@@ -0,0 +1,2 @@
+librt.so.1
+libc.so.6
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index c986a92eac..087de0df2a 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=5.2.12
-revision=1
+revision=2
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2"
 build_style=configure
 configure_args="--libexecdir=/lib/dhcpcd"
@@ -16,7 +16,6 @@ long_desc="
  computer to work on the attached networks without trouble and mostly without
  configuration."
 
-Add_dependency run glibc
 Add_dependency build ntp
 
 conf_files="/etc/dhcpcd.conf"
diff --git a/srcpkgs/docbook2x/docbook2x.rshlibs b/srcpkgs/docbook2x/docbook2x.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/docbook2x/docbook2x.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/docbook2x/template b/srcpkgs/docbook2x/template
index a77559826d..696e5248b9 100644
--- a/srcpkgs/docbook2x/template
+++ b/srcpkgs/docbook2x/template
@@ -5,6 +5,7 @@ patch_args="-Np1"
 wrksrc="docbook2X-${version}"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/docbook2X-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="DocBook converter to UNIX manpage and GNU Texinfo format"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://docbook2x.sourceforge.net"
@@ -18,7 +19,6 @@ export xml_entries="
 nextCatalog /usr/share/docbook2X/dtd/catalog.xml --
 nextCatalog /usr/share/docbook2X/xslt/catalog.xml --"
 
-Add_dependency run glibc
 Add_dependency full texinfo
 Add_dependency full libxslt
 Add_dependency full docbook
diff --git a/srcpkgs/e2fsprogs/e2fsprogs-libs.rshlibs b/srcpkgs/e2fsprogs/e2fsprogs-libs.rshlibs
new file mode 100644
index 0000000000..bac4323acd
--- /dev/null
+++ b/srcpkgs/e2fsprogs/e2fsprogs-libs.rshlibs
@@ -0,0 +1,4 @@
+libdl.so.2
+libc.so.6
+libpthread.so.0
+ld-linux.so.2
diff --git a/srcpkgs/e2fsprogs/e2fsprogs-libs.template b/srcpkgs/e2fsprogs/e2fsprogs-libs.template
index 2211cf9451..18ee811c74 100644
--- a/srcpkgs/e2fsprogs/e2fsprogs-libs.template
+++ b/srcpkgs/e2fsprogs/e2fsprogs-libs.template
@@ -1,11 +1,11 @@
 # Template file for 'e2fsprogs-libs'.
 #
+revision=1
 short_desc="${short_desc} (shared libraries)"
 long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-Add_dependency run glibc
 
 do_install()
 {
diff --git a/srcpkgs/e2fsprogs/e2fsprogs.rshlibs b/srcpkgs/e2fsprogs/e2fsprogs.rshlibs
new file mode 100644
index 0000000000..e06a22d90e
--- /dev/null
+++ b/srcpkgs/e2fsprogs/e2fsprogs.rshlibs
@@ -0,0 +1,7 @@
+libext2fs.so.2
+libcom_err.so.2
+libe2p.so.2
+libuuid.so.1
+libc.so.6
+libblkid.so.1
+libss.so.2
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index 56053a0536..2b37078d0b 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,7 +1,7 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
 version=1.41.14
-revision=2
+revision=3
 distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
@@ -18,10 +18,6 @@ long_desc="
 
 subpackages="$pkgname-devel $pkgname-libs"
 conf_files="/etc/mke2fs.conf"
-Add_dependency run glibc
-Add_dependency run libuuid
-Add_dependency run libblkid
-Add_dependency run e2fsprogs-libs
 Add_dependency build gettext
 Add_dependency build libuuid-devel
 Add_dependency build libblkid-devel
diff --git a/srcpkgs/ed/ed.rshlibs b/srcpkgs/ed/ed.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/ed/ed.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/ed/template b/srcpkgs/ed/template
index e99a93d937..6daa16d83f 100644
--- a/srcpkgs/ed/template
+++ b/srcpkgs/ed/template
@@ -4,6 +4,7 @@ version=1.5
 distfiles="http://ftp.gnu.org/gnu/ed/ed-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--prefix=/ --mandir=/usr/share/man --infodir=/usr/share/info"
+revision=1
 short_desc="GNU Line-oriented text editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=97dd34a49ebc9c97e414b90a087d63eafc41377a340848c97e75a9cba187fba1
@@ -14,5 +15,4 @@ long_desc="
  and cannot execute shell commands. Ed is the standard text editor in the
  sense that it is the original editor for Unix, and thus widely available."
  
-Add_dependency run glibc
 Add_dependency build texinfo
diff --git a/srcpkgs/eject/eject.rshlibs b/srcpkgs/eject/eject.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/eject/eject.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/eject/template b/srcpkgs/eject/template
index df0015c7fd..9501a416e7 100644
--- a/srcpkgs/eject/template
+++ b/srcpkgs/eject/template
@@ -1,7 +1,7 @@
 # Template file for 'eject'
 pkgname=eject
 version=2.1.5
-revision=1
+revision=2
 distfiles="http://archive.ubuntu.com/ubuntu/pool/main/e/eject/eject_$version.orig.tar.gz"
 build_style=gnu-configure
 short_desc="Ejects CDs and operates CD-Changers under Linux"
@@ -17,5 +17,4 @@ long_desc="
  You can also use eject to properly disconnect external mass-storage devices
  like digital cameras or portable music players."
 
-Add_dependency run glibc
 Add_dependency build gettext
diff --git a/srcpkgs/expat/expat.rshlibs b/srcpkgs/expat/expat.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/expat/expat.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index 74b13dce5e..b56250afc4 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,7 +1,7 @@
 # Template file for 'expat'
 pkgname=expat
 version=2.0.1
-revision=1
+revision=2
 distfiles="$SOURCEFORGE_SITE/expat/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="XML parser library written in C"
@@ -13,4 +13,3 @@ long_desc="
  structure that the parser discovers in the document."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
diff --git a/srcpkgs/findutils/findutils.rshlibs b/srcpkgs/findutils/findutils.rshlibs
new file mode 100644
index 0000000000..07bdfe70f5
--- /dev/null
+++ b/srcpkgs/findutils/findutils.rshlibs
@@ -0,0 +1,3 @@
+libc.so.6
+librt.so.1
+libm.so.6
diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index 1635b68511..1dd9a6d0c3 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,7 +1,7 @@
 # Template file for 'findutils'
 pkgname=findutils
 version=4.4.2
-revision=3
+revision=4
 homepage="http://www.gnu.org/software/findutils"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -18,7 +18,6 @@ long_desc="
 
 conf_files="/etc/updatedb.conf"
 
-Add_dependency run glibc
 Add_dependency build gettext
 Add_dependency build texinfo
 
diff --git a/srcpkgs/flex/flex.rshlibs b/srcpkgs/flex/flex.rshlibs
new file mode 100644
index 0000000000..7c868f9838
--- /dev/null
+++ b/srcpkgs/flex/flex.rshlibs
@@ -0,0 +1,2 @@
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/flex/template b/srcpkgs/flex/template
index 40e6d8c3b6..bffbd7317d 100644
--- a/srcpkgs/flex/template
+++ b/srcpkgs/flex/template
@@ -4,6 +4,7 @@ version=2.5.35
 distfiles="$SOURCEFORGE_SITE/flex/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-rpath"
+revision=1
 short_desc="The Fast Lexical Analyzer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b
diff --git a/srcpkgs/fontconfig/fontconfig.rshlibs b/srcpkgs/fontconfig/fontconfig.rshlibs
new file mode 100644
index 0000000000..0abb9cfb01
--- /dev/null
+++ b/srcpkgs/fontconfig/fontconfig.rshlibs
@@ -0,0 +1,5 @@
+libc.so.6
+libfreetype.so.6
+libz.so.1
+libbz2.so.1
+libexpat.so.1
diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template
index 0e8435955c..3bc759f974 100644
--- a/srcpkgs/fontconfig/template
+++ b/srcpkgs/fontconfig/template
@@ -1,7 +1,7 @@
 # Template build file for 'fontconfig'.
 pkgname=fontconfig
 version=2.8.0
-revision=3
+revision=4
 distfiles="ftp://mirror.ovh.net/gentoo-distfiles/distfiles/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-docs --with-cache-dir=/var/cache/$pkgname"
@@ -36,11 +36,6 @@ long_desc="
 
 conf_files="/etc/fonts/fonts.conf"
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run expat
-Add_dependency run freetype
-Add_dependency run zlib
-Add_dependency run bzip2
 Add_dependency build pkg-config
 Add_dependency build expat-devel
 Add_dependency build freetype-devel
diff --git a/srcpkgs/freetype/freetype.rshlibs b/srcpkgs/freetype/freetype.rshlibs
new file mode 100644
index 0000000000..0aaa236eec
--- /dev/null
+++ b/srcpkgs/freetype/freetype.rshlibs
@@ -0,0 +1,3 @@
+libz.so.1
+libbz2.so.1
+libc.so.6
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index eb8f5379aa..12db183e23 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -4,6 +4,7 @@ version=2.4.7
 patch_args="-Np1"
 distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Font rendering engine and library API"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freetype.org/"
@@ -21,9 +22,6 @@ long_desc="
   * An improved anti-aliasing algorithm"
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run bzip2
 Add_dependency build pkg-config
 Add_dependency build zlib-devel
 Add_dependency build bzip2-devel
diff --git a/srcpkgs/fuse/fuse.rshlibs b/srcpkgs/fuse/fuse.rshlibs
new file mode 100644
index 0000000000..7b9e62abb0
--- /dev/null
+++ b/srcpkgs/fuse/fuse.rshlibs
@@ -0,0 +1,4 @@
+libc.so.6
+libpthread.so.0
+librt.so.1
+libdl.so.2
diff --git a/srcpkgs/fuse/template b/srcpkgs/fuse/template
index c6b80701cf..14a1f74ae6 100644
--- a/srcpkgs/fuse/template
+++ b/srcpkgs/fuse/template
@@ -5,6 +5,7 @@ homepage="http://fuse.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-lib --enable-util --bindir=/bin"
+revision=1
 short_desc="Filesystem in Userspace"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -22,7 +23,6 @@ long_desc="
   * Has proven very stable over time"
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 
 post_install() {
 	# remove obsolete rules file provided by udev.
diff --git a/srcpkgs/gawk/gawk.rshlibs b/srcpkgs/gawk/gawk.rshlibs
new file mode 100644
index 0000000000..dd1bcc0139
--- /dev/null
+++ b/srcpkgs/gawk/gawk.rshlibs
@@ -0,0 +1,3 @@
+libdl.so.2
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index 9cfa473093..1cd2521ac8 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -5,6 +5,7 @@ homepage="http://www.gnu.org/directory/GNU/gawk.html"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="ac_cv_func_working_mktime=yes"
+revision=1
 short_desc="The GNU awk utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -12,6 +13,5 @@ checksum=c3a7cf7d976e05c6a1d8a9b3f14fa55d4304707408ddafb1396212653ea00be5
 long_desc="
  The GNU AWK utility, a pattern scanning and processing tool."
 
-Add_dependency run glibc
 Add_dependency build gettext
 Add_dependency build texinfo
diff --git a/srcpkgs/gdbm/gdbm.rshlibs b/srcpkgs/gdbm/gdbm.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/gdbm/gdbm.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template
index 81eef9b8d2..141ceb98bc 100644
--- a/srcpkgs/gdbm/template
+++ b/srcpkgs/gdbm/template
@@ -1,7 +1,7 @@
 # Template file for 'gdbm'
 pkgname=gdbm
 version=1.8.3
-revision=2
+revision=3
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 make_install_args="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version"
@@ -13,7 +13,6 @@ long_desc="
  It works similar to the standard Unix dbm routines."
 
 subpackages="gdbm-devel"
-Add_dependency run glibc
 
 post_build()
 {
diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.rshlibs b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.rshlibs
new file mode 100644
index 0000000000..ae53b9f61b
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.rshlibs
@@ -0,0 +1,5 @@
+libgdk_pixbuf-2.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
index 09dd7a5670..8c2bb8d835 100644
--- a/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
+++ b/srcpkgs/gdk-pixbuf/gdk-pixbuf-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'gdk-pixbuf-devel'.
 #
+revision=1
 short_desc="${short_desc} - development files"
 long_desc="
  ${pkgname} is An image loading library for GTK+.
@@ -8,16 +9,12 @@ long_desc="
 
 replaces="gtk+-devel<2.22"
 
-Add_dependency run glibc
-Add_dependency run glib
 Add_dependency run perl		">=0"
 Add_dependency run pkg-config
-Add_dependency run glib-devel
 Add_dependency run libpng-devel
 Add_dependency run jpeg-devel
 Add_dependency run tiff-devel
 Add_dependency run libX11-devel
-Add_dependency run gdk-pixbuf
 
 do_install()
 {
diff --git a/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs b/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
new file mode 100644
index 0000000000..48c2231345
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf/gdk-pixbuf.rshlibs
@@ -0,0 +1,13 @@
+libgmodule-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libgio-2.0.so.0
+libpng14.so.14
+libm.so.6
+libX11.so.6
+libgobject-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libjpeg.so.8
+libtiff.so.3
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 67db6835f4..a105cd8beb 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -4,6 +4,7 @@ version=2.24.0
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--without-libjasper --with-included-loaders=png"
+revision=1
 short_desc="An Image loading library for The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -17,12 +18,6 @@ replaces="gtk+<2.22"
 triggers="gtk-pixbuf-loaders"
 subpackages="$pkgname-devel"
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run libpng
-Add_dependency run jpeg
-Add_dependency run tiff
-Add_dependency run libX11
 
 Add_dependency build perl	">=0"
 Add_dependency build pkg-config
diff --git a/srcpkgs/gettext/gettext-libs.rshlibs b/srcpkgs/gettext/gettext-libs.rshlibs
new file mode 100644
index 0000000000..3d6081484d
--- /dev/null
+++ b/srcpkgs/gettext/gettext-libs.rshlibs
@@ -0,0 +1,2 @@
+libncursesw.so.6
+libc.so.6
diff --git a/srcpkgs/gettext/gettext-libs.template b/srcpkgs/gettext/gettext-libs.template
index 0e61d97297..f138e28db9 100644
--- a/srcpkgs/gettext/gettext-libs.template
+++ b/srcpkgs/gettext/gettext-libs.template
@@ -5,10 +5,8 @@ long_desc="${long_desc}
 
  This package contains the ${sourcepkg} shared libraries."
 
-revision=1
+revision=2
 
-Add_dependency run glibc
-Add_dependency run ncurses-libs
 
 do_install()
 {
diff --git a/srcpkgs/gettext/gettext.rshlibs b/srcpkgs/gettext/gettext.rshlibs
new file mode 100644
index 0000000000..1aee6ecaa4
--- /dev/null
+++ b/srcpkgs/gettext/gettext.rshlibs
@@ -0,0 +1,7 @@
+libc.so.6
+libgettextsrc-0.18.1.so
+libgettextlib-0.18.1.so
+libdl.so.2
+libm.so.6
+libgomp.so.1
+libpthread.so.0
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 9dd0f3e792..abfa5c64be 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,7 +1,7 @@
 # Template build file for 'gettext'.
 pkgname=gettext
 version=0.18.1.1
-revision=1
+revision=2
 distfiles="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-java --disable-native-java --disable-csharp
@@ -17,9 +17,6 @@ long_desc="
  internationalisation (or i18n) of a utility."
 
 subpackages="$pkgname-devel $pkgname-libs"
-Add_dependency run glibc
-Add_dependency run gettext-libs
-Add_dependency run libgomp
 Add_dependency build ncurses-devel
 Add_dependency build diffutils
 
diff --git a/srcpkgs/git/git.rshlibs b/srcpkgs/git/git.rshlibs
new file mode 100644
index 0000000000..a9778cf151
--- /dev/null
+++ b/srcpkgs/git/git.rshlibs
@@ -0,0 +1,7 @@
+libz.so.1
+libcrypto.so.1
+libpthread.so.0
+libc.so.6
+libcurl.so.4
+libssl.so.1
+libexpat.so.1
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 51c86776e6..5483aad79f 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -3,6 +3,7 @@ pkgname=git
 version=1.7.7.3
 distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz"
 #distfiles="http://www.kernel.org/pub/software/scm/git/git-$version.tar.bz2"
+revision=1
 short_desc="GIT Tree History Storage Tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://git-scm.com/"
@@ -20,11 +21,6 @@ long_desc="
  capabilities, not dependent on network access to a central server."
 
 subpackages="git-docs git-perl git-python"
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run expat
-Add_dependency run libssl
-Add_dependency run libcurl
 
 Add_dependency build asciidoc
 Add_dependency build xmlto
diff --git a/srcpkgs/glib/glib-devel.rshlibs b/srcpkgs/glib/glib-devel.rshlibs
new file mode 100644
index 0000000000..dde8ba064e
--- /dev/null
+++ b/srcpkgs/glib/glib-devel.rshlibs
@@ -0,0 +1,4 @@
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libc.so.6
+libpthread.so.0
diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index 5c4c44ff8a..c0bfe2abb5 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -1,5 +1,6 @@
 # Template file for 'glib-devel'.
 #
+revision=1
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
@@ -7,13 +8,11 @@ long_desc="${long_desc}
 
 pycompile_dirs="usr/lib/gdbus-2.0/codegen"
 
-Add_dependency run glibc
 Add_dependency run zlib-devel
 Add_dependency run pcre-devel
 Add_dependency run libffi-devel
 Add_dependency run coreutils  # required by glib-mkenums /usr/bin/env
 Add_dependency run perl ">=0" # required by glib-mkenums
-Add_dependency run glib
 
 do_install()
 {
diff --git a/srcpkgs/glib/glib.rshlibs b/srcpkgs/glib/glib.rshlibs
new file mode 100644
index 0000000000..43f7af9aea
--- /dev/null
+++ b/srcpkgs/glib/glib.rshlibs
@@ -0,0 +1,8 @@
+libc.so.6
+libpthread.so.0
+libpcre.so.0
+librt.so.1
+libffi.so.5
+libdl.so.2
+libz.so.1
+libresolv.so.2
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 18221746a9..799451faec 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -4,6 +4,7 @@ version=2.30.1
 distfiles="${GNOME_SITE}/glib/2.30/glib-$version.tar.xz"
 configure_args="--disable-fam --with-pcre=system"
 build_style=gnu-configure
+revision=1
 short_desc="The GNU library of C routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -15,10 +16,6 @@ long_desc="
  C library used by projects such as GTK+, GIMP and GNOME."
 
 subpackages="glib-devel"
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libpcre
-Add_dependency run libffi
 
 Add_dependency build python	">=0"
 Add_dependency build coreutils
diff --git a/srcpkgs/gnutls/gnutls-tools.rshlibs b/srcpkgs/gnutls/gnutls-tools.rshlibs
new file mode 100644
index 0000000000..5c1952def4
--- /dev/null
+++ b/srcpkgs/gnutls/gnutls-tools.rshlibs
@@ -0,0 +1,5 @@
+libgnutls.so.26
+libc.so.6
+libpthread.so.0
+libreadline.so.6
+libgnutls-extra.so.26
diff --git a/srcpkgs/gnutls/gnutls-tools.template b/srcpkgs/gnutls/gnutls-tools.template
index edcc3a5615..5b43dad37f 100644
--- a/srcpkgs/gnutls/gnutls-tools.template
+++ b/srcpkgs/gnutls/gnutls-tools.template
@@ -1,14 +1,12 @@
 # Template file for 'gnutls-tools'.
 #
+revision=1
 short_desc="${short_desc} (bundled tools)"
 long_desc="${long_desc}
 
  This package contains the tools that come with gnutls."
 
-Add_dependency run glibc
 Add_dependency run libgcrypt
-Add_dependency run readline
-Add_dependency run gnutls
 
 do_install()
 {
diff --git a/srcpkgs/gnutls/gnutls.rshlibs b/srcpkgs/gnutls/gnutls.rshlibs
new file mode 100644
index 0000000000..14e2357be0
--- /dev/null
+++ b/srcpkgs/gnutls/gnutls.rshlibs
@@ -0,0 +1,11 @@
+libtasn1.so.3
+libgcrypt.so.11
+libgpg-error.so.0
+libz.so.1
+libdl.so.2
+libpthread.so.0
+libc.so.6
+liblzo2.so.2
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 9e3ce3d543..1d69f157b3 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -5,6 +5,7 @@ version=2.12.7
 distfiles="http://mirror.symnds.com/software/GNU/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-lzo --with-zlib --disable-guile --with-libgcrypt"
+revision=1
 short_desc="GNU Transport Layer Security library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/gnutls/"
@@ -28,14 +29,6 @@ long_desc="
  library, to ease integration with existing applications."
 
 subpackages="$pkgname-devel $pkgname-tools"
-Add_dependency run glibc
-Add_dependency run libgcc
-Add_dependency run libstdc++
-Add_dependency run libgpg-error
-Add_dependency run zlib
-Add_dependency run libtasn1
-Add_dependency run libgcrypt
-Add_dependency run lzo
 
 Add_dependency build gettext
 Add_dependency build texinfo
diff --git a/srcpkgs/gobject-introspection/gobject-introspection.rshlibs b/srcpkgs/gobject-introspection/gobject-introspection.rshlibs
new file mode 100644
index 0000000000..e41ee88f73
--- /dev/null
+++ b/srcpkgs/gobject-introspection/gobject-introspection.rshlibs
@@ -0,0 +1,11 @@
+libgirepository-1.0.so.1
+libm.so.6
+libgio-2.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libffi.so.5
+libpthread.so.0
+libc.so.6
+libgthread-2.0.so.0
+librt.so.1
+libdl.so.2
diff --git a/srcpkgs/gobject-introspection/libgirepository.rshlibs b/srcpkgs/gobject-introspection/libgirepository.rshlibs
new file mode 100644
index 0000000000..ab4d5e05e6
--- /dev/null
+++ b/srcpkgs/gobject-introspection/libgirepository.rshlibs
@@ -0,0 +1,11 @@
+libm.so.6
+libgio-2.0.so.0
+libgobject-2.0.so.0
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libglib-2.0.so.0
+libffi.so.5
+libdl.so.2
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/gobject-introspection/libgirepository.template b/srcpkgs/gobject-introspection/libgirepository.template
index 96b8490bbd..13f4a56bb0 100644
--- a/srcpkgs/gobject-introspection/libgirepository.template
+++ b/srcpkgs/gobject-introspection/libgirepository.template
@@ -1,5 +1,6 @@
 # Template file for 'libgirepository'.
 #
+revision=1
 short_desc="Library for handling GObject introspection data (runtime library)"
 long_desc="${long_desc}
 
@@ -7,9 +8,6 @@ long_desc="${long_desc}
 
 replaces="gobject-introspection<0.6.10"
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run libffi
 
 do_install()
 {
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 37305f864d..af2f312f49 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,7 +1,7 @@
 # Template file for 'gobject-introspection'
 pkgname=gobject-introspection
 version=1.30.0
-revision=1
+revision=2
 distfiles="${GNOME_SITE}/$pkgname/1.30/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-tests"
@@ -17,12 +17,7 @@ long_desc="
 subpackages="gir-freedesktop libgirepository libgirepository-devel"
 pycompile_dirs="usr/lib/$pkgname/giscanner"
 
-Add_dependency run glibc
-Add_dependency run libffi
-Add_dependency run glib
 Add_dependency run python
-Add_dependency run libgirepository
-Add_dependency run libgirepository-devel
 
 Add_dependency build pkg-config
 Add_dependency build flex
diff --git a/srcpkgs/gperf/gperf.rshlibs b/srcpkgs/gperf/gperf.rshlibs
new file mode 100644
index 0000000000..7d25808e3e
--- /dev/null
+++ b/srcpkgs/gperf/gperf.rshlibs
@@ -0,0 +1,4 @@
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
+libc.so.6
diff --git a/srcpkgs/gperf/template b/srcpkgs/gperf/template
index fe2d2223cc..7c17a76913 100644
--- a/srcpkgs/gperf/template
+++ b/srcpkgs/gperf/template
@@ -1,7 +1,7 @@
 # Template file for 'gperf'
 pkgname=gperf
 version=3.0.3
-revision=2
+revision=3
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="Perfect hash function generator"
@@ -18,9 +18,6 @@ long_desc="
  code, for emitting switch statements or nested ifs instead of a hash table,
  and for tuning the algorithm employed by gperf."
 
-Add_dependency run glibc
-Add_dependency run libgcc
-Add_dependency run libstdc++
 Add_dependency build texinfo
 
 post_install()
diff --git a/srcpkgs/grep/grep.rshlibs b/srcpkgs/grep/grep.rshlibs
new file mode 100644
index 0000000000..07f52b9fd0
--- /dev/null
+++ b/srcpkgs/grep/grep.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libpcre.so.0
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index 943b7453c5..6d9219b471 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,7 +1,7 @@
 # Template build file for 'grep'.
 pkgname=grep
 version=2.9
-revision=1
+revision=2
 distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="The GNU grep utility"
@@ -14,8 +14,6 @@ long_desc="
  full regexp matcher without necessarily having to look at every character.
  The result is typically many times faster than Unix grep or egrep."
 
-Add_dependency run glibc
-Add_dependency run libpcre
 Add_dependency build texinfo
 Add_dependency build gettext
 Add_dependency build pcre-devel
diff --git a/srcpkgs/groff/groff.rshlibs b/srcpkgs/groff/groff.rshlibs
new file mode 100644
index 0000000000..7d25808e3e
--- /dev/null
+++ b/srcpkgs/groff/groff.rshlibs
@@ -0,0 +1,4 @@
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
+libc.so.6
diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template
index ac392482b2..15c961cda1 100644
--- a/srcpkgs/groff/template
+++ b/srcpkgs/groff/template
@@ -4,6 +4,7 @@ version=1.21
 distfiles="http://ftp.gnu.org/gnu/groff/groff-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--without-x"
+revision=1
 short_desc="The GNU troff text-formatting system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=344e6af5480e7ab4ec51e2a2ed10acd69ba3e062d285b6d5f6d49fb5ed2f9f7a
@@ -18,9 +19,6 @@ long_desc="
 
 subpackages="groff-doc"
 
-Add_dependency run glibc
-Add_dependency run libgcc
-Add_dependency run libstdc++
 Add_dependency run zlib
 Add_dependency build bison
 Add_dependency build texinfo
diff --git a/srcpkgs/gtk+/gtk+-demo.rshlibs b/srcpkgs/gtk+/gtk+-demo.rshlibs
new file mode 100644
index 0000000000..2c5b8594e9
--- /dev/null
+++ b/srcpkgs/gtk+/gtk+-demo.rshlibs
@@ -0,0 +1,11 @@
+libgdk-x11-2.0.so.0
+libgtk-x11-2.0.so.0
+libpangocairo-1.0.so.0
+libcairo.so.2
+libgdk_pixbuf-2.0.so.0
+libpango-1.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libm.so.6
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/gtk+/gtk+-demo.template b/srcpkgs/gtk+/gtk+-demo.template
index 680dd35895..7f335c40d5 100644
--- a/srcpkgs/gtk+/gtk+-demo.template
+++ b/srcpkgs/gtk+/gtk+-demo.template
@@ -1,17 +1,12 @@
 # Template file for 'gtk+-demo'.
 #
+revision=1
 short_desc="${sourcepkg} - demonstration application"
 long_desc="${long_desc}
 
  This package contains the example files and a demonstration program
  for GTK+3."
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run pango
-Add_dependency run cairo
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
 
 do_install()
 {
diff --git a/srcpkgs/gtk+/gtk+.rshlibs b/srcpkgs/gtk+/gtk+.rshlibs
new file mode 100644
index 0000000000..299f4680f3
--- /dev/null
+++ b/srcpkgs/gtk+/gtk+.rshlibs
@@ -0,0 +1,27 @@
+libpango-1.0.so.0
+libgmodule-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libgdk_pixbuf-2.0.so.0
+libgobject-2.0.so.0
+libpangocairo-1.0.so.0
+libgio-2.0.so.0
+libfontconfig.so.1
+libXext.so.6
+libXrender.so.1
+libXinerama.so.1
+libXi.so.6
+libXrandr.so.2
+libXcursor.so.1
+libXcomposite.so.1
+libXdamage.so.1
+libXfixes.so.3
+libgthread-2.0.so.0
+librt.so.1
+libcairo.so.2
+libX11.so.6
+libm.so.6
+libatk-1.0.so.0
+libpangoft2-1.0.so.0
+libfreetype.so.6
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index a3f908a5e3..8ff58adbc3 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -4,6 +4,7 @@ version=2.24.8
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-cups --with-xinput"
+revision=1
 short_desc="The GTK+ toolkit (v2)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org"
@@ -24,25 +25,7 @@ conf_files="/etc/gtk-2.0/im-multipress.conf"
 triggers="gtk-immodules"
 subpackages="gtk+-devel gtk+-demo"
 
-Add_dependency run glibc
-Add_dependency run libXext
-Add_dependency run libXrender
-Add_dependency run libXinerama
-Add_dependency run libXi
-Add_dependency run libXrandr
-Add_dependency run libXcursor
-Add_dependency run pango
-Add_dependency run libX11
-Add_dependency run libXcomposite
-Add_dependency run libXdamage
-Add_dependency run libXfixes
-Add_dependency run atk
-Add_dependency run cairo
-Add_dependency run gdk-pixbuf
 Add_dependency run libpng
-Add_dependency run glib
-Add_dependency run freetype
-Add_dependency run fontconfig
 Add_dependency run shared-mime-info
 
 Add_dependency build pkg-config
diff --git a/srcpkgs/gtk+3/gtk+3-demo.rshlibs b/srcpkgs/gtk+3/gtk+3-demo.rshlibs
new file mode 100644
index 0000000000..daf545c17f
--- /dev/null
+++ b/srcpkgs/gtk+3/gtk+3-demo.rshlibs
@@ -0,0 +1,12 @@
+libgtk-3.so.0
+libgdk-3.so.0
+libpangocairo-1.0.so.0
+libcairo.so.2
+libgdk_pixbuf-2.0.so.0
+libgio-2.0.so.0
+libpango-1.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libm.so.6
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/gtk+3/gtk+3-demo.template b/srcpkgs/gtk+3/gtk+3-demo.template
index 71d7312d7e..5dc8496741 100644
--- a/srcpkgs/gtk+3/gtk+3-demo.template
+++ b/srcpkgs/gtk+3/gtk+3-demo.template
@@ -1,17 +1,12 @@
 # Template file for 'gtk+3-demo'.
 #
+revision=1
 short_desc="${sourcepkg} - demonstration application"
 long_desc="${long_desc}
 
  This package contains the example files and a demonstration program
  for GTK+3."
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run pango
-Add_dependency run cairo
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+3
 
 do_install()
 {
diff --git a/srcpkgs/gtk+3/gtk+3.rshlibs b/srcpkgs/gtk+3/gtk+3.rshlibs
new file mode 100644
index 0000000000..8329cdcf0a
--- /dev/null
+++ b/srcpkgs/gtk+3/gtk+3.rshlibs
@@ -0,0 +1,27 @@
+libpango-1.0.so.0
+libgmodule-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libXext.so.6
+libXinerama.so.1
+libXi.so.6
+libXrandr.so.2
+libXcursor.so.1
+libpangocairo-1.0.so.0
+libX11.so.6
+libXcomposite.so.1
+libXdamage.so.1
+libXfixes.so.3
+libatk-1.0.so.0
+libcairo-gobject.so.2
+libcairo.so.2
+libgdk_pixbuf-2.0.so.0
+libgio-2.0.so.0
+libpangoft2-1.0.so.0
+libfreetype.so.6
+libfontconfig.so.1
+libgobject-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libm.so.6
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 4a061a21b7..0b843ce454 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -6,6 +6,7 @@ distfiles="${GNOME_SITE}/gtk+/3.2/gtk+-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-cups --disable-schemas-compile
 --enable-gtk2-dependency --enable-colord"
+revision=1
 short_desc="The GTK+ toolkit (v3)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
@@ -26,24 +27,7 @@ triggers="gtk3-immodules"
 conf_files="/etc/gtk-3.0/im-multipress.conf"
 subpackages="gtk+3-devel gtk+3-demo"
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run atk
-Add_dependency run pango
-Add_dependency run cairo
 Add_dependency run libpng
-Add_dependency run fontconfig
-Add_dependency run freetype
-Add_dependency run gdk-pixbuf
-Add_dependency run libXext
-Add_dependency run libXinerama
-Add_dependency run libXi
-Add_dependency run libXrandr
-Add_dependency run libXcursor
-Add_dependency run libX11
-Add_dependency run libXcomposite
-Add_dependency run libXdamage
-Add_dependency run libXfixes
 Add_dependency run gtk+ ">=0"		# for gtk-update-icon-cache
 Add_dependency run shared-mime-info
 Add_dependency run colord
diff --git a/srcpkgs/ifenslave/ifenslave.rshlibs b/srcpkgs/ifenslave/ifenslave.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/ifenslave/ifenslave.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/ifenslave/template b/srcpkgs/ifenslave/template
index b6abd233ab..d6631bd456 100644
--- a/srcpkgs/ifenslave/template
+++ b/srcpkgs/ifenslave/template
@@ -1,7 +1,7 @@
 # Template file for 'ifenslave'
 pkgname=ifenslave
 version=1.1.0
-revision=1
+revision=2
 short_desc="Attach and detach slave interfaces to a bonding device"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8773541ce097fdc4c5b9e7da12a82dffbb30cd91f7bc169f52f05f93b7fc3060
@@ -18,7 +18,6 @@ long_desc="
 nofetch=yes
 noextract=yes
 
-Add_dependency run glibc
 
 do_build()
 {
diff --git a/srcpkgs/iproute2/iproute2.rshlibs b/srcpkgs/iproute2/iproute2.rshlibs
new file mode 100644
index 0000000000..b0ee0bb0e6
--- /dev/null
+++ b/srcpkgs/iproute2/iproute2.rshlibs
@@ -0,0 +1,6 @@
+libdl.so.2
+libc.so.6
+libm.so.6
+libdb-4.8.so
+libpthread.so.0
+libxtables.so.7
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index e5d1b19836..67fdb0c7cd 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -4,6 +4,7 @@ version=2.6.39
 patch_args="-Np1"
 #distfiles="http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-$version.tar.gz"
 distfiles="http://ftp-nyc.osuosl.org/pub/lfs/lfs-packages/lfs-packages-svn-20110904/$pkgname-$version.tar.gz"
+revision=1
 short_desc="IP Routing Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.linux-foundation.org/en/Net:Iproute2"
@@ -21,9 +22,6 @@ conf_files="
 /etc/iproute2/rt_scopes
 /etc/iproute2/rt_tables"
 
-Add_dependency run glibc
-Add_dependency run libdb
-Add_dependency run iptables
 
 Add_dependency build perl	">=0"
 Add_dependency build db-devel
diff --git a/srcpkgs/iptables/iptables.rshlibs b/srcpkgs/iptables/iptables.rshlibs
new file mode 100644
index 0000000000..c3afdd1315
--- /dev/null
+++ b/srcpkgs/iptables/iptables.rshlibs
@@ -0,0 +1,3 @@
+libc.so.6
+libm.so.6
+libdl.so.2
diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template
index 5f2fe8efcb..1c71eb843e 100644
--- a/srcpkgs/iptables/template
+++ b/srcpkgs/iptables/template
@@ -1,7 +1,7 @@
 # Template file for 'iptables'
 pkgname=iptables
 version=1.4.12
-revision=1
+revision=2
 distfiles="http://www.iptables.org/projects/iptables/files/$pkgname-$version.tar.bz2"
 short_desc="Linux IPv[46] packet filtering ruleset"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -20,7 +20,6 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency run glibc
 Add_dependency build sed
 Add_dependency build kernel-headers
 
diff --git a/srcpkgs/iputils/iputils.rshlibs b/srcpkgs/iputils/iputils.rshlibs
new file mode 100644
index 0000000000..03ed47023c
--- /dev/null
+++ b/srcpkgs/iputils/iputils.rshlibs
@@ -0,0 +1,4 @@
+libc.so.6
+libresolv.so.2
+libcrypto.so.1
+libsysfs.so.2
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index 0c8a64f075..7bc8928268 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,6 +6,7 @@ wrksrc="${pkgname}-s${version}"
 #distfiles="http://www.skbuff.net/${pkgname}/${pkgname}-s${version}.tar.bz2"
 distfiles="http://cross-lfs.org/files/packages/svn/${pkgname}-s${version}.tar.bz2"
 build_style=gnu-makefile
+revision=1
 short_desc="IP Configuration Utilities (and ping)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7
@@ -13,9 +14,6 @@ long_desc="
  The iputils package is set of small useful utilities for Linux networking.
  It was originally maintained by Alexey Kuznetsov."
 
-Add_dependency run glibc
-Add_dependency run libssl
-Add_dependency run libsysfs
 Add_dependency build libsysfs-devel
 Add_dependency build openssl-devel
 
diff --git a/srcpkgs/jpeg/jpeg-tools.rshlibs b/srcpkgs/jpeg/jpeg-tools.rshlibs
new file mode 100644
index 0000000000..d25204bf67
--- /dev/null
+++ b/srcpkgs/jpeg/jpeg-tools.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libjpeg.so.8
diff --git a/srcpkgs/jpeg/jpeg-tools.template b/srcpkgs/jpeg/jpeg-tools.template
index 7d76436a81..b694c6bb7e 100644
--- a/srcpkgs/jpeg/jpeg-tools.template
+++ b/srcpkgs/jpeg/jpeg-tools.template
@@ -5,11 +5,9 @@ long_desc="${long_desc}
 
  This package contains tools to manipulate JPG files."
 
-revision=1
+revision=2
 replaces="jpeg-tools>=0"
 
-Add_dependency run glibc
-Add_dependency run jpeg		">=${version}"
 
 do_install()
 {
diff --git a/srcpkgs/jpeg/jpeg.rshlibs b/srcpkgs/jpeg/jpeg.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/jpeg/jpeg.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/jpeg/template b/srcpkgs/jpeg/template
index 20a1e97f6b..0bc720c5eb 100644
--- a/srcpkgs/jpeg/template
+++ b/srcpkgs/jpeg/template
@@ -1,7 +1,7 @@
 # Template build file for 'jpeg'.
 pkgname=jpeg
 version=8c
-revision=1
+revision=2
 distfiles="http://www.ijg.org/files/jpegsrc.v${version}.tar.gz"
 build_style=gnu-configure
 make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr
@@ -21,7 +21,6 @@ long_desc="
  Wrjpgcom inserts text comments into a JPEG file."
 
 subpackages="jpeg-devel jpeg-tools"
-Add_dependency run glibc
 replaces="jpeg>=0"
 
 post_install()
diff --git a/srcpkgs/kbd/kbd.rshlibs b/srcpkgs/kbd/kbd.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/kbd/kbd.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template
index b447a0bc81..509fbb35f6 100644
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@@ -1,7 +1,7 @@
 # Template file for 'kbd'
 pkgname=kbd
 version=1.15.3
-revision=2
+revision=3
 distfiles="${KERNEL_SITE}/utils/kbd/kbd-$version.tar.bz2"
 build_style=configure
 configure_args="--datadir=/lib/kbd --bindir=/sbin
@@ -13,7 +13,6 @@ long_desc="
  The kbd package contains keytable files and keyboard utilities compatible
  with kernel version 1.1.54 and later. Setfont requires 1.1.92 or later."
 
-Add_dependency run glibc
 Add_dependency build flex
 Add_dependency build gettext
 
diff --git a/srcpkgs/lcms2/lcms2.rshlibs b/srcpkgs/lcms2/lcms2.rshlibs
new file mode 100644
index 0000000000..2a1b9451cb
--- /dev/null
+++ b/srcpkgs/lcms2/lcms2.rshlibs
@@ -0,0 +1,4 @@
+libc.so.6
+libjpeg.so.8
+libtiff.so.3
+libm.so.6
diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template
index 33308a0afb..d0f7f5730c 100644
--- a/srcpkgs/lcms2/template
+++ b/srcpkgs/lcms2/template
@@ -3,6 +3,7 @@ pkgname=lcms2
 version=2.2
 distfiles="${SOURCEFORGE_SITE}/lcms/lcms2-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="Small-footprint color management engine, version 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.littlecms.com"
@@ -17,7 +18,4 @@ long_desc="
  printers."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run jpeg
-Add_dependency run tiff
 Add_dependency build tiff-devel
diff --git a/srcpkgs/less/less.rshlibs b/srcpkgs/less/less.rshlibs
new file mode 100644
index 0000000000..93ab318b0f
--- /dev/null
+++ b/srcpkgs/less/less.rshlibs
@@ -0,0 +1,3 @@
+libc.so.6
+libncursesw.so.6
+libpcre.so.0
diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index 18adf06ca3..512856d2be 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -5,6 +5,7 @@ homepage="http://www.greenwoodsoftware.com/less"
 distfiles="$homepage/less-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-regex=pcre"
+revision=1
 short_desc="Pager program similar to more(1)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -17,8 +18,5 @@ long_desc="
  termcap (or terminfo on some systems), so it can run on a variety of
  terminals.  There is even limited support for hardcopy terminals."
 
-Add_dependency run glibc
-Add_dependency run ncurses-libs
-Add_dependency run libpcre
 Add_dependency build ncurses-devel
 Add_dependency build pcre-devel
diff --git a/srcpkgs/libICE/libICE.rshlibs b/srcpkgs/libICE/libICE.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libICE/libICE.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libICE/template b/srcpkgs/libICE/template
index c9be24f9ef..b2d191f4d5 100644
--- a/srcpkgs/libICE/template
+++ b/srcpkgs/libICE/template
@@ -3,6 +3,7 @@ pkgname=libICE
 version=1.0.7
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Inter Client Exchange (ICE) library for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a8b1692f151a473cee8733df9aefe98f7e5f64dfe6d4213cb6231d7bf855b901
@@ -16,4 +17,3 @@ subpackages="$pkgname-devel"
 Add_dependency build pkg-config
 Add_dependency build xtrans
 Add_dependency build xproto
-Add_dependency run glibc
diff --git a/srcpkgs/libSM/libSM.rshlibs b/srcpkgs/libSM/libSM.rshlibs
new file mode 100644
index 0000000000..2fbc78dbda
--- /dev/null
+++ b/srcpkgs/libSM/libSM.rshlibs
@@ -0,0 +1,3 @@
+libICE.so.6
+libuuid.so.1
+libc.so.6
diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template
index 1d90322975..8e0041aede 100644
--- a/srcpkgs/libSM/template
+++ b/srcpkgs/libSM/template
@@ -3,6 +3,7 @@ pkgname=libSM
 version=1.2.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="X Session Management Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0cd8df1b7067bfda10b05d38279777770677c6fecb5a14e804a28597da7a57cb
@@ -11,9 +12,6 @@ long_desc="
  Management Library. This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libuuid
-Add_dependency run libICE
 Add_dependency build pkg-config
 Add_dependency build xtrans
 Add_dependency build libuuid-devel
diff --git a/srcpkgs/libX11/libX11.rshlibs b/srcpkgs/libX11/libX11.rshlibs
new file mode 100644
index 0000000000..d23ec4a0a6
--- /dev/null
+++ b/srcpkgs/libX11/libX11.rshlibs
@@ -0,0 +1,3 @@
+libxcb.so.1
+libdl.so.2
+libc.so.6
diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index e4ac1172f5..5fcbd61d31 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -5,6 +5,7 @@ distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
 --disable-secure-rpc --enable-loadable-i18n"
+revision=1
 short_desc="Base X libraries from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
@@ -17,8 +18,6 @@ long_desc="
  This is from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libxcb
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
diff --git a/srcpkgs/libXau/libXau.rshlibs b/srcpkgs/libXau/libXau.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libXau/libXau.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template
index 6e1e677041..e76c3bd612 100644
--- a/srcpkgs/libXau/template
+++ b/srcpkgs/libXau/template
@@ -1,7 +1,7 @@
 # Template build file for 'libXau'.
 pkgname=libXau
 version=1.0.5
-revision=1
+revision=2
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 short_desc="Authorization Protocol for X from X.org"
@@ -12,6 +12,5 @@ long_desc="
  X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXcomposite/libXcomposite.rshlibs b/srcpkgs/libXcomposite/libXcomposite.rshlibs
new file mode 100644
index 0000000000..bbd524cddc
--- /dev/null
+++ b/srcpkgs/libXcomposite/libXcomposite.rshlibs
@@ -0,0 +1,2 @@
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template
index 6d139e23dd..3e374bbc34 100644
--- a/srcpkgs/libXcomposite/template
+++ b/srcpkgs/libXcomposite/template
@@ -3,6 +3,7 @@ pkgname=libXcomposite
 version=0.4.3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="X Composite Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad
@@ -11,8 +12,6 @@ long_desc="
  Library. This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
 
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXcursor/libXcursor.rshlibs b/srcpkgs/libXcursor/libXcursor.rshlibs
new file mode 100644
index 0000000000..9a36052e3c
--- /dev/null
+++ b/srcpkgs/libXcursor/libXcursor.rshlibs
@@ -0,0 +1,4 @@
+libXrender.so.1
+libXfixes.so.3
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template
index ac83c70ddd..547ee8d841 100644
--- a/srcpkgs/libXcursor/template
+++ b/srcpkgs/libXcursor/template
@@ -3,6 +3,7 @@ pkgname=libXcursor
 version=1.1.12
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Client-side cursor loading library for X"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0c4de165e07ac66b091af50a4db1f07e3c14d1bcf80830013693a21ef03e7ba4
@@ -16,10 +17,6 @@ long_desc="
  This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run libXrender
-Add_dependency run libXfixes
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build libX11-devel
diff --git a/srcpkgs/libXdamage/libXdamage.rshlibs b/srcpkgs/libXdamage/libXdamage.rshlibs
new file mode 100644
index 0000000000..7a4c3efccc
--- /dev/null
+++ b/srcpkgs/libXdamage/libXdamage.rshlibs
@@ -0,0 +1,3 @@
+libXfixes.so.3
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template
index e43c9713d5..1326209c3c 100644
--- a/srcpkgs/libXdamage/template
+++ b/srcpkgs/libXdamage/template
@@ -3,6 +3,7 @@ pkgname=libXdamage
 version=1.1.3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Xdamage extension (Library)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8
@@ -10,9 +11,6 @@ long_desc="
  This package contains the Xdamage extension."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run libXfixes
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build damageproto
diff --git a/srcpkgs/libXdmcp/libXdmcp.rshlibs b/srcpkgs/libXdmcp/libXdmcp.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libXdmcp/libXdmcp.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libXdmcp/template b/srcpkgs/libXdmcp/template
index db7b01e13c..379badf8a4 100644
--- a/srcpkgs/libXdmcp/template
+++ b/srcpkgs/libXdmcp/template
@@ -1,7 +1,7 @@
 # Template build file for 'libXdmcp'.
 pkgname=libXdmcp
 version=1.0.3
-revision=1
+revision=2
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 short_desc="X Display Manager Control Protocol library from X.org"
@@ -12,6 +12,5 @@ long_desc="
  from the modular X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXext/libXext.rshlibs b/srcpkgs/libXext/libXext.rshlibs
new file mode 100644
index 0000000000..bbd524cddc
--- /dev/null
+++ b/srcpkgs/libXext/libXext.rshlibs
@@ -0,0 +1,2 @@
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXext/template b/srcpkgs/libXext/template
index 5b6c62b8eb..b462ecce88 100644
--- a/srcpkgs/libXext/template
+++ b/srcpkgs/libXext/template
@@ -3,6 +3,7 @@ pkgname=libXext
 version=1.3.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="X Extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0
@@ -11,8 +12,6 @@ long_desc="
  X.org X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
diff --git a/srcpkgs/libXfixes/libXfixes.rshlibs b/srcpkgs/libXfixes/libXfixes.rshlibs
new file mode 100644
index 0000000000..bbd524cddc
--- /dev/null
+++ b/srcpkgs/libXfixes/libXfixes.rshlibs
@@ -0,0 +1,2 @@
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template
index 3b949cb381..9b5a2c0564 100644
--- a/srcpkgs/libXfixes/template
+++ b/srcpkgs/libXfixes/template
@@ -3,6 +3,7 @@ pkgname=libXfixes
 version=5.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Xfixes library and extension of X RandR from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=537a2446129242737a35db40081be4bbcc126e56c03bf5f2b142b10a79cda2e3
@@ -16,8 +17,6 @@ long_desc="
  X11 project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build fixesproto
diff --git a/srcpkgs/libXft/libXft.rshlibs b/srcpkgs/libXft/libXft.rshlibs
new file mode 100644
index 0000000000..41b89fde0d
--- /dev/null
+++ b/srcpkgs/libXft/libXft.rshlibs
@@ -0,0 +1,5 @@
+libfontconfig.so.1
+libfreetype.so.6
+libXrender.so.1
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template
index e394e737d4..da730b140e 100644
--- a/srcpkgs/libXft/template
+++ b/srcpkgs/libXft/template
@@ -1,7 +1,7 @@
 # Template build file for 'libXft'.
 pkgname=libXft
 version=2.1.14
-revision=1
+revision=2
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 short_desc="Library for configuring and customizing font access"
@@ -20,11 +20,6 @@ long_desc="
  environment."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run libXrender
-Add_dependency run freetype
-Add_dependency run fontconfig
 
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXi/libXi.rshlibs b/srcpkgs/libXi/libXi.rshlibs
new file mode 100644
index 0000000000..1449a92ff0
--- /dev/null
+++ b/srcpkgs/libXi/libXi.rshlibs
@@ -0,0 +1,3 @@
+libX11.so.6
+libXext.so.6
+libc.so.6
diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template
index 05f670a759..ec8ca1bf24 100644
--- a/srcpkgs/libXi/template
+++ b/srcpkgs/libXi/template
@@ -3,6 +3,7 @@ pkgname=libXi
 version=1.4.3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="X Input extension library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.x.org/"
@@ -16,9 +17,6 @@ long_desc="
  freedesktop.org."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run libXext
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
diff --git a/srcpkgs/libXinerama/libXinerama.rshlibs b/srcpkgs/libXinerama/libXinerama.rshlibs
new file mode 100644
index 0000000000..1449a92ff0
--- /dev/null
+++ b/srcpkgs/libXinerama/libXinerama.rshlibs
@@ -0,0 +1,3 @@
+libX11.so.6
+libXext.so.6
+libc.so.6
diff --git a/srcpkgs/libXinerama/template b/srcpkgs/libXinerama/template
index be50702c77..01c22ca9f9 100644
--- a/srcpkgs/libXinerama/template
+++ b/srcpkgs/libXinerama/template
@@ -1,7 +1,7 @@
 # Template build file for 'libXinerama'.
 pkgname=libXinerama
 version=1.1
-revision=2
+revision=3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 short_desc="X PanoramiX extension library"
@@ -11,9 +11,6 @@ long_desc="
  libXinerama provides X PanoramiX extension library."
 
 subpackages="$pkgname-devel"
-Add_dependency run libX11
-Add_dependency run libXext
-Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
diff --git a/srcpkgs/libXrandr/libXrandr.rshlibs b/srcpkgs/libXrandr/libXrandr.rshlibs
new file mode 100644
index 0000000000..cab90c9caa
--- /dev/null
+++ b/srcpkgs/libXrandr/libXrandr.rshlibs
@@ -0,0 +1,4 @@
+libXext.so.6
+libXrender.so.1
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template
index c194856703..6131ceba1f 100644
--- a/srcpkgs/libXrandr/template
+++ b/srcpkgs/libXrandr/template
@@ -3,6 +3,7 @@ pkgname=libXrandr
 version=1.3.1
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="X RandR Library from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=62bba708649c04cbbc2f5de910942a01cc727b27225bc06169af8a89b957c661
@@ -16,10 +17,6 @@ long_desc="
  the ability to reflect the screen about either axis."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run libXext
-Add_dependency run libXrender
 
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXrender/libXrender.rshlibs b/srcpkgs/libXrender/libXrender.rshlibs
new file mode 100644
index 0000000000..bbd524cddc
--- /dev/null
+++ b/srcpkgs/libXrender/libXrender.rshlibs
@@ -0,0 +1,2 @@
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXrender/template b/srcpkgs/libXrender/template
index aeab0243ec..307e9b8c15 100644
--- a/srcpkgs/libXrender/template
+++ b/srcpkgs/libXrender/template
@@ -3,6 +3,7 @@ pkgname=libXrender
 version=0.9.6
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="X Render Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668
@@ -19,8 +20,6 @@ long_desc="
  This is the modular X.org X11 project version."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
 Add_dependency build pkg-config
 Add_dependency build renderproto
 Add_dependency build libX11-devel
diff --git a/srcpkgs/libXt/libXt.rshlibs b/srcpkgs/libXt/libXt.rshlibs
new file mode 100644
index 0000000000..85d98dde26
--- /dev/null
+++ b/srcpkgs/libXt/libXt.rshlibs
@@ -0,0 +1,4 @@
+libSM.so.6
+libICE.so.6
+libX11.so.6
+libc.so.6
diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template
index 82bab85c4a..f58a1d97c1 100644
--- a/srcpkgs/libXt/template
+++ b/srcpkgs/libXt/template
@@ -3,6 +3,7 @@ pkgname=libXt
 version=1.1.1
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="X Toolkit Intrinsics library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a2a1c29c684e3c9082cdb920b5aea802b179d19107b9ab2170fda07575559da7
@@ -15,10 +16,6 @@ long_desc="
  This is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libSM
-Add_dependency run libICE
-Add_dependency run libX11
 
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/libXxf86vm/libXxf86vm.rshlibs b/srcpkgs/libXxf86vm/libXxf86vm.rshlibs
new file mode 100644
index 0000000000..1449a92ff0
--- /dev/null
+++ b/srcpkgs/libXxf86vm/libXxf86vm.rshlibs
@@ -0,0 +1,3 @@
+libX11.so.6
+libXext.so.6
+libc.so.6
diff --git a/srcpkgs/libXxf86vm/template b/srcpkgs/libXxf86vm/template
index a3342ce6bd..d67043f23b 100644
--- a/srcpkgs/libXxf86vm/template
+++ b/srcpkgs/libXxf86vm/template
@@ -1,7 +1,7 @@
 # Template build file for 'libXxf86vm'.
 pkgname=libXxf86vm
 version=1.1.0
-revision=2
+revision=3
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 short_desc="Library for the XFree86-VidMode X extension"
@@ -15,9 +15,6 @@ long_desc="
  This library is from the modular X.org project."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run libXext
 Add_dependency build pkg-config
 Add_dependency build xproto
 Add_dependency build xextproto
diff --git a/srcpkgs/libarchive/bsdcpio.rshlibs b/srcpkgs/libarchive/bsdcpio.rshlibs
new file mode 100644
index 0000000000..bf4adcf465
--- /dev/null
+++ b/srcpkgs/libarchive/bsdcpio.rshlibs
@@ -0,0 +1,8 @@
+libacl.so.1
+libattr.so.1
+libexpat.so.1
+liblzma.so.5
+libbz2.so.1
+libz.so.1
+libcrypto.so.1
+libc.so.6
diff --git a/srcpkgs/libarchive/bsdcpio.template b/srcpkgs/libarchive/bsdcpio.template
index 4ba799a90d..a0f32a9011 100644
--- a/srcpkgs/libarchive/bsdcpio.template
+++ b/srcpkgs/libarchive/bsdcpio.template
@@ -1,5 +1,6 @@
 # Template file for 'bsdcpio'.
 #
+revision=1
 short_desc="BSD cpio(1) using libarchive"
 long_desc="
  This package provides an interface similar to cpio(1), but using libarchive
@@ -26,14 +27,6 @@ long_desc="
  * GNU tar support. Libarchive reads most GNU tar archives. If there
    is demand, this can be improved further."
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run bzip2
-Add_dependency run acl
-Add_dependency run attr
-Add_dependency run libssl
-Add_dependency run expat
-Add_dependency run liblzma
 
 do_install()
 {
diff --git a/srcpkgs/libarchive/bsdtar.rshlibs b/srcpkgs/libarchive/bsdtar.rshlibs
new file mode 100644
index 0000000000..bf4adcf465
--- /dev/null
+++ b/srcpkgs/libarchive/bsdtar.rshlibs
@@ -0,0 +1,8 @@
+libacl.so.1
+libattr.so.1
+libexpat.so.1
+liblzma.so.5
+libbz2.so.1
+libz.so.1
+libcrypto.so.1
+libc.so.6
diff --git a/srcpkgs/libarchive/bsdtar.template b/srcpkgs/libarchive/bsdtar.template
index 51320e3a29..cfb0f799a2 100644
--- a/srcpkgs/libarchive/bsdtar.template
+++ b/srcpkgs/libarchive/bsdtar.template
@@ -1,5 +1,6 @@
 # Template file for 'bsdtar'.
 #
+revision=1
 short_desc="BSD tar(1) using libarchive"
 long_desc="
  The bsdtar program has a number of advantages over previous tar
@@ -27,14 +28,6 @@ long_desc="
  * GNU tar support. Libarchive reads most GNU tar archives. If there
    is demand, this can be improved further."
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run bzip2
-Add_dependency run acl
-Add_dependency run attr
-Add_dependency run libssl
-Add_dependency run expat
-Add_dependency run liblzma
 
 do_install()
 {
diff --git a/srcpkgs/libarchive/libarchive.rshlibs b/srcpkgs/libarchive/libarchive.rshlibs
new file mode 100644
index 0000000000..bf4adcf465
--- /dev/null
+++ b/srcpkgs/libarchive/libarchive.rshlibs
@@ -0,0 +1,8 @@
+libacl.so.1
+libattr.so.1
+libexpat.so.1
+liblzma.so.5
+libbz2.so.1
+libz.so.1
+libcrypto.so.1
+libc.so.6
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 60f6b7578d..0d013d950e 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -4,6 +4,7 @@ version=2.8.5
 distfiles="http://libarchive.googlecode.com/files/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--without-xml2"
+revision=1
 short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/libarchive"
@@ -16,14 +17,6 @@ long_desc="
  shar archives and read ISO9660 CDROM images and ZIP archives."
 
 subpackages="bsdtar bsdcpio $pkgname-devel"
-Add_dependency run glibc
-Add_dependency run bzip2
-Add_dependency run zlib
-Add_dependency run attr
-Add_dependency run acl
-Add_dependency run libssl
-Add_dependency run liblzma
-Add_dependency run expat
 
 Add_dependency build bzip2-devel
 Add_dependency build zlib-devel
diff --git a/srcpkgs/libcap/libcap-pam.rshlibs b/srcpkgs/libcap/libcap-pam.rshlibs
new file mode 100644
index 0000000000..c8d6a9742d
--- /dev/null
+++ b/srcpkgs/libcap/libcap-pam.rshlibs
@@ -0,0 +1,2 @@
+libcap.so.2
+libc.so.6
diff --git a/srcpkgs/libcap/libcap-pam.template b/srcpkgs/libcap/libcap-pam.template
index fc51669328..cbfab54b2e 100644
--- a/srcpkgs/libcap/libcap-pam.template
+++ b/srcpkgs/libcap/libcap-pam.template
@@ -1,5 +1,6 @@
 # Template file for 'libcap-pam'.
 #
+revision=1
 short_desc="${short_desc} (PAM module)"
 long_desc="${long_desc}
 
@@ -7,9 +8,7 @@ long_desc="${long_desc}
 
 conf_files="/etc/security/capability.conf"
 
-Add_dependency run glibc
 Add_dependency run attr
-Add_dependency run libcap
 Add_dependency run pam
 
 do_install()
diff --git a/srcpkgs/libcap/libcap-progs.rshlibs b/srcpkgs/libcap/libcap-progs.rshlibs
new file mode 100644
index 0000000000..c8d6a9742d
--- /dev/null
+++ b/srcpkgs/libcap/libcap-progs.rshlibs
@@ -0,0 +1,2 @@
+libcap.so.2
+libc.so.6
diff --git a/srcpkgs/libcap/libcap-progs.template b/srcpkgs/libcap/libcap-progs.template
index b390c6118f..977694323c 100644
--- a/srcpkgs/libcap/libcap-progs.template
+++ b/srcpkgs/libcap/libcap-progs.template
@@ -1,12 +1,11 @@
 # Template file for 'libcap-progs'.
 #
+revision=1
 short_desc="${short_desc} (utilities)"
 long_desc="${long_desc}
 
  This package contains binary utilities provided by the libcap package."
 
-Add_dependency run glibc
-Add_dependency run libcap
 
 do_install()
 {
diff --git a/srcpkgs/libcap/libcap.rshlibs b/srcpkgs/libcap/libcap.rshlibs
new file mode 100644
index 0000000000..625c5030c1
--- /dev/null
+++ b/srcpkgs/libcap/libcap.rshlibs
@@ -0,0 +1,2 @@
+libattr.so.1
+libc.so.6
diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template
index 026dfb0995..154b61a3fc 100644
--- a/srcpkgs/libcap/template
+++ b/srcpkgs/libcap/template
@@ -1,7 +1,7 @@
 # Template file for 'libcap'
 pkgname=libcap
 version=2.22
-revision=1
+revision=2
 distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/$pkgname-$version.tar.bz2"
 short_desc="POSIX.1e capabilities library"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,8 +13,6 @@ long_desc="
  draft 15 capabilities."
 
 subpackages="$pkgname-devel $pkgname-pam $pkgname-progs"
-Add_dependency run glibc
-Add_dependency run attr
 Add_dependency build perl
 Add_dependency build pam-devel
 Add_dependency build attr-devel
diff --git a/srcpkgs/libdrm/libdrm.rshlibs b/srcpkgs/libdrm/libdrm.rshlibs
new file mode 100644
index 0000000000..24f68f846f
--- /dev/null
+++ b/srcpkgs/libdrm/libdrm.rshlibs
@@ -0,0 +1,3 @@
+librt.so.1
+libc.so.6
+libpciaccess.so.0
diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template
index a77bd555c1..06d3b0cccd 100644
--- a/srcpkgs/libdrm/template
+++ b/srcpkgs/libdrm/template
@@ -6,6 +6,7 @@ distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-udev --enable-vmwgfx-experimental-api
 --enable-nouveau-experimental-api --enable-intel --enable-radeon"
+revision=1
 short_desc="Userspace interface to kernel DRM services"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://dri.freedesktop.org/"
@@ -17,9 +18,7 @@ long_desc="
  graphics hardware."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency run libudev
-Add_dependency run libpciaccess
 
 Add_dependency build automake
 Add_dependency build pkg-config
diff --git a/srcpkgs/libfetch/libfetch.rshlibs b/srcpkgs/libfetch/libfetch.rshlibs
new file mode 100644
index 0000000000..800e971ee9
--- /dev/null
+++ b/srcpkgs/libfetch/libfetch.rshlibs
@@ -0,0 +1,3 @@
+libssl.so.1
+libcrypto.so.1
+libc.so.6
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index f5bee217c2..cbae5f5373 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -3,6 +3,7 @@ pkgname=libfetch
 version=2.33
 distfiles="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-makefile
+revision=1
 short_desc="File Transfer Library for URLs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3226f53d5ad29cc27510db968ef0d37bf4554b8aaaeadcd56e23067213b08943
@@ -11,8 +12,6 @@ long_desc="
  files using Uniform Resource Locators (URLs)."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libssl
 Add_dependency build openssl-devel
 
 pre_build()
diff --git a/srcpkgs/libffi/libffi.rshlibs b/srcpkgs/libffi/libffi.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libffi/libffi.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libffi/template b/srcpkgs/libffi/template
index 4984c64da8..5c0363de58 100644
--- a/srcpkgs/libffi/template
+++ b/srcpkgs/libffi/template
@@ -4,6 +4,7 @@ version=3.0.10
 distfiles="ftp://sourceware.org/pub/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--includedir=/usr/include"
+revision=1
 short_desc="Library supporting Foreign Function Interfaces"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://sourceware.org/libffi"
@@ -29,7 +30,6 @@ long_desc="
  between the two languages."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency build texinfo
 
 post_install()
diff --git a/srcpkgs/libgcrypt/libgcrypt-devel.rshlibs b/srcpkgs/libgcrypt/libgcrypt-devel.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libgcrypt/libgcrypt-devel.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libgcrypt/libgcrypt-devel.template b/srcpkgs/libgcrypt/libgcrypt-devel.template
index cc69a1f48f..29edf706a0 100644
--- a/srcpkgs/libgcrypt/libgcrypt-devel.template
+++ b/srcpkgs/libgcrypt/libgcrypt-devel.template
@@ -1,11 +1,11 @@
 # Template file for 'libgrypt-devel'.
 #
+revision=1
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run glibc
 Add_dependency run libgpg-error-devel
 Add_dependency run libgcrypt
 
diff --git a/srcpkgs/libgcrypt/libgcrypt.rshlibs b/srcpkgs/libgcrypt/libgcrypt.rshlibs
new file mode 100644
index 0000000000..5ff01ff846
--- /dev/null
+++ b/srcpkgs/libgcrypt/libgcrypt.rshlibs
@@ -0,0 +1,2 @@
+libgpg-error.so.0
+libc.so.6
diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index 95ed0b37ee..247addf47a 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -3,6 +3,7 @@ pkgname=libgcrypt
 version=1.4.6
 distfiles="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="GNU cryptographic library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85
@@ -15,7 +16,5 @@ long_desc="
  lot of supporting functions."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libgpg-error
 Add_dependency build texinfo
 Add_dependency build libgpg-error-devel
diff --git a/srcpkgs/libgpg-error/libgpg-error.rshlibs b/srcpkgs/libgpg-error/libgpg-error.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libgpg-error/libgpg-error.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template
index 099ce69056..63b7da34de 100644
--- a/srcpkgs/libgpg-error/template
+++ b/srcpkgs/libgpg-error/template
@@ -3,6 +3,7 @@ pkgname=libgpg-error
 version=1.10
 distfiles="ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Library for error values used by GnuPG component"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=520629b4568b5c29b1991c8ffc267c8bdee5f223c7333c42a651b56f9b1c5431
@@ -12,7 +13,6 @@ long_desc="
  libgcrypt, pinentry, SmartCard Daemon and possibly more in the future."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency build gettext
 Add_dependency build gawk
 
diff --git a/srcpkgs/libgudev/libgudev.rshlibs b/srcpkgs/libgudev/libgudev.rshlibs
new file mode 100644
index 0000000000..e710f007be
--- /dev/null
+++ b/srcpkgs/libgudev/libgudev.rshlibs
@@ -0,0 +1,7 @@
+libudev.so.0
+libgobject-2.0.so.0
+libgthread-2.0.so.0
+libglib-2.0.so.0
+librt.so.1
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 0ce9fddfb2..6fb6eef16d 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -8,6 +8,7 @@ build_style=gnu-configure
 configure_args="--without-selinux --disable-rule-generator
 --enable-introspection --enable-gudev --disable-static
 --disable-hwdb --disable-keymap --disable-mtd_probe"
+revision=1
 short_desc="GObject-based wrapper library for libudev"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -21,9 +22,6 @@ long_desc="
 
 subpackages="${pkgname}-devel"
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run libudev
 
 Add_dependency build pkg-config
 Add_dependency build gperf
diff --git a/srcpkgs/libidn/libidn.rshlibs b/srcpkgs/libidn/libidn.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libidn/libidn.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template
index 7b127a3035..c15bf36546 100644
--- a/srcpkgs/libidn/template
+++ b/srcpkgs/libidn/template
@@ -4,6 +4,7 @@ version=1.22
 distfiles="http://ftp.gnu.org/gnu/libidn/libidn-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-csharp --disable-java --enable-threads=posix"
+revision=1
 short_desc="Internationalized Domain Names command line tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libidn/"
@@ -24,7 +25,6 @@ long_desc="
  IDNA are supported."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency build perl
 Add_dependency build pkg-config
 Add_dependency build gettext
diff --git a/srcpkgs/libldap/libldap.rshlibs b/srcpkgs/libldap/libldap.rshlibs
new file mode 100644
index 0000000000..64ebf6d550
--- /dev/null
+++ b/srcpkgs/libldap/libldap.rshlibs
@@ -0,0 +1,6 @@
+libresolv.so.2
+libc.so.6
+libsasl2.so.2
+libssl.so.1
+libcrypto.so.1
+libpthread.so.0
diff --git a/srcpkgs/libldap/template b/srcpkgs/libldap/template
index e03c105a01..eb47968a87 100644
--- a/srcpkgs/libldap/template
+++ b/srcpkgs/libldap/template
@@ -7,6 +7,7 @@ build_style=gnu-configure
 configure_args="--enable-dynamic --enable-proctitle
 --enable-ipv6 --enable-local --with-cyrus-sasl --with-threads --with-tls
 --enable-syslog --disable-slapd"
+revision=1
 short_desc="OpenLDAP libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fdcecb64082a0d8e124f13b31fccf4765901e29decaf4224b28d4cff90a14614
@@ -17,9 +18,6 @@ long_desc="
 conf_files="/etc/openldap/ldap.conf" 
 subpackages="libldap-devel"
 
-Add_dependency run glibc
-Add_dependency run libsasl
-Add_dependency run libssl
 Add_dependency build pkg-config
 Add_dependency build libsasl-devel
 Add_dependency build openssl-devel
diff --git a/srcpkgs/libnl/libnl.rshlibs b/srcpkgs/libnl/libnl.rshlibs
new file mode 100644
index 0000000000..7c868f9838
--- /dev/null
+++ b/srcpkgs/libnl/libnl.rshlibs
@@ -0,0 +1,2 @@
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/libnl/template b/srcpkgs/libnl/template
index 6f006cfa6c..79a636e4f8 100644
--- a/srcpkgs/libnl/template
+++ b/srcpkgs/libnl/template
@@ -1,7 +1,7 @@
 # Template file for 'libnl'
 pkgname=libnl
 version=1.1
-revision=1
+revision=2
 distfiles="ftp://ftp.archlinux.org/other/libnl/${pkgname}-${version}.tar.gz"
 build_style=gnu-configure
 short_desc="Library for applications dealing with netlink sockets"
@@ -13,4 +13,3 @@ long_desc="
  netlink family specific interfaces."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
diff --git a/srcpkgs/libnotify/libnotify.rshlibs b/srcpkgs/libnotify/libnotify.rshlibs
new file mode 100644
index 0000000000..c8f881caef
--- /dev/null
+++ b/srcpkgs/libnotify/libnotify.rshlibs
@@ -0,0 +1,9 @@
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libgdk_pixbuf-2.0.so.0
+libgio-2.0.so.0
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index c7d6cae54a..7b3bb7b457 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -3,6 +3,7 @@ pkgname=libnotify
 version=0.7.4
 distfiles="${GNOME_SITE}/$pkgname/0.7/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Desktop notification library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://library.gnome.org/devel/notification-spec/"
@@ -14,10 +15,7 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-Add_dependency run glibc
-Add_dependency run glib
 Add_dependency run libpng
-Add_dependency run gdk-pixbuf
 
 Add_dependency build pkg-config
 Add_dependency build glib-devel
diff --git a/srcpkgs/libpciaccess/libpciaccess.rshlibs b/srcpkgs/libpciaccess/libpciaccess.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libpciaccess/libpciaccess.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libpciaccess/template b/srcpkgs/libpciaccess/template
index 8156a7f332..0383b84530 100644
--- a/srcpkgs/libpciaccess/template
+++ b/srcpkgs/libpciaccess/template
@@ -3,6 +3,7 @@ pkgname=libpciaccess
 version=0.12.1
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="PCI Access from Modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=cc47d7f0e48cf4eed972916b536fdc97788d7521915e3ae1cc92d540776d7344
@@ -11,4 +12,3 @@ long_desc="
  operating systems."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
diff --git a/srcpkgs/libpipeline/libpipeline.rshlibs b/srcpkgs/libpipeline/libpipeline.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libpipeline/libpipeline.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libpipeline/template b/srcpkgs/libpipeline/template
index 40c541b5f0..682dd255ea 100644
--- a/srcpkgs/libpipeline/template
+++ b/srcpkgs/libpipeline/template
@@ -3,6 +3,7 @@ pkgname=libpipeline
 version=1.2.0
 distfiles="${NONGNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="A pipeline manipulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b1c83ad98fb58542594ba631a4e6c70cdb090bb6798e6eb26afe9cc39babbb8e
@@ -14,4 +15,3 @@ long_desc="
  and execve(2)."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
diff --git a/srcpkgs/libpng/libpng.rshlibs b/srcpkgs/libpng/libpng.rshlibs
new file mode 100644
index 0000000000..b8c1a6af49
--- /dev/null
+++ b/srcpkgs/libpng/libpng.rshlibs
@@ -0,0 +1,3 @@
+libz.so.1
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template
index cc687511d2..4e49bf3407 100644
--- a/srcpkgs/libpng/template
+++ b/srcpkgs/libpng/template
@@ -4,6 +4,7 @@ version=1.4.8
 patch_args="-Np1"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Library for manipulating PNG images"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.libpng.org/pub/png/libpng.html"
@@ -20,8 +21,6 @@ long_desc="
  only supports C. Support for other languages is being considered."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run zlib
 Add_dependency build zlib-devel
 
 post_install()
diff --git a/srcpkgs/libsasl/libsasl.rshlibs b/srcpkgs/libsasl/libsasl.rshlibs
new file mode 100644
index 0000000000..cc5b583215
--- /dev/null
+++ b/srcpkgs/libsasl/libsasl.rshlibs
@@ -0,0 +1,4 @@
+libresolv.so.2
+libdb-4.8.so
+libc.so.6
+libdl.so.2
diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template
index 8c216adab7..26905a9642 100644
--- a/srcpkgs/libsasl/template
+++ b/srcpkgs/libsasl/template
@@ -1,7 +1,7 @@
 # Template file for 'libsasl'
 pkgname=libsasl
 version=2.1.23
-revision=2
+revision=3
 wrksrc="cyrus-sasl-${version}"
 distfiles="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-$version.tar.gz"
 build_style=gnu-configure
@@ -26,8 +26,6 @@ long_desc="
 
 subpackages="libsasl-devel"
 
-Add_dependency run glibc
-Add_dependency run libdb
 Add_dependency build db-devel
 Add_dependency build openssl-devel
 
diff --git a/srcpkgs/libtasn1/libtasn1-tools.rshlibs b/srcpkgs/libtasn1/libtasn1-tools.rshlibs
new file mode 100644
index 0000000000..b989cff93f
--- /dev/null
+++ b/srcpkgs/libtasn1/libtasn1-tools.rshlibs
@@ -0,0 +1,2 @@
+libtasn1.so.3
+libc.so.6
diff --git a/srcpkgs/libtasn1/libtasn1-tools.template b/srcpkgs/libtasn1/libtasn1-tools.template
index 2ede09168f..10cbe8fe88 100644
--- a/srcpkgs/libtasn1/libtasn1-tools.template
+++ b/srcpkgs/libtasn1/libtasn1-tools.template
@@ -1,12 +1,11 @@
 # Template file for 'libtasn1-tools'.
 #
+revision=1
 short_desc="${short_desc} (ASN.1 tools)"
 long_desc="${long_desc}
 
  This package contains some ASN.1 tools that come with libtasn1."
 
-Add_dependency run glibc
-Add_dependency run libtasn1
 
 do_install()
 {
diff --git a/srcpkgs/libtasn1/libtasn1.rshlibs b/srcpkgs/libtasn1/libtasn1.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/libtasn1/libtasn1.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/libtasn1/template b/srcpkgs/libtasn1/template
index d515df8345..e3064b7078 100644
--- a/srcpkgs/libtasn1/template
+++ b/srcpkgs/libtasn1/template
@@ -3,6 +3,7 @@ pkgname=libtasn1
 version=2.6
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="ASN.1 structure parser library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=7aeb9ccec4ed7136441498d14ba3b4104cd6a6d4b489bbb010280999ebaaf9c7
@@ -19,5 +20,4 @@ long_desc="
   - no limits for INTEGER and ENUMERATED values."
 
 subpackages="$pkgname-devel $pkgname-tools"
-Add_dependency run glibc
 Add_dependency build texinfo
diff --git a/srcpkgs/libtool/libltdl.rshlibs b/srcpkgs/libtool/libltdl.rshlibs
new file mode 100644
index 0000000000..d02f93f916
--- /dev/null
+++ b/srcpkgs/libtool/libltdl.rshlibs
@@ -0,0 +1,2 @@
+libdl.so.2
+libc.so.6
diff --git a/srcpkgs/libtool/libltdl.template b/srcpkgs/libtool/libltdl.template
index dc33dcc816..44c71d3a9c 100644
--- a/srcpkgs/libtool/libltdl.template
+++ b/srcpkgs/libtool/libltdl.template
@@ -1,5 +1,6 @@
 # Template file for 'libltdl'.
 #
+revision=1
 short_desc="Runtime libraries for GNU Libtool Dynamic Module Loader"
 long_desc="
  This package contains the GNU Libtool Dynamic Module Loader, a
@@ -11,7 +12,6 @@ long_desc="
  rest of the GNU Autotools (including GNU Autoconf and GNU Automake)."
 
 replaces="libtool-ltdl>=0"
-Add_dependency run glibc
  
 do_install()
 {
diff --git a/srcpkgs/libusb-compat/libusb-compat.rshlibs b/srcpkgs/libusb-compat/libusb-compat.rshlibs
new file mode 100644
index 0000000000..d80bdd6350
--- /dev/null
+++ b/srcpkgs/libusb-compat/libusb-compat.rshlibs
@@ -0,0 +1,2 @@
+libusb-1.0.so.0
+libc.so.6
diff --git a/srcpkgs/libusb-compat/template b/srcpkgs/libusb-compat/template
index 13a0fb444a..ee4e53b323 100644
--- a/srcpkgs/libusb-compat/template
+++ b/srcpkgs/libusb-compat/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb-compat'
 pkgname=libusb-compat
 version=0.1.3
-revision=1
+revision=2
 distfiles="${SOURCEFORGE_SITE}/libusb/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 short_desc="A libusb-0.1 compatibility library"
@@ -13,7 +13,5 @@ long_desc="
  just converts libusb-0.1 calls into their libusb-1.0 equivalents."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libusb
 Add_dependency build pkg-config
 Add_dependency build libusb-devel
diff --git a/srcpkgs/libusb/libusb.rshlibs b/srcpkgs/libusb/libusb.rshlibs
new file mode 100644
index 0000000000..d1507aad9d
--- /dev/null
+++ b/srcpkgs/libusb/libusb.rshlibs
@@ -0,0 +1,3 @@
+librt.so.1
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index ebf1d6b9cf..60eb921269 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -3,6 +3,7 @@ pkgname=libusb
 version=1.0.8
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="A library which allows userspace access to USB devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=21d0d3a5710f7f4211c595102c6b9eccb42435a17a4f5bd2c3f4166ab1badba9
@@ -10,4 +11,3 @@ long_desc="
  This package provides a way for applications to access USB devices."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
diff --git a/srcpkgs/libxcb/libxcb.rshlibs b/srcpkgs/libxcb/libxcb.rshlibs
new file mode 100644
index 0000000000..53e0c4df92
--- /dev/null
+++ b/srcpkgs/libxcb/libxcb.rshlibs
@@ -0,0 +1,3 @@
+libXau.so.6
+libXdmcp.so.6
+libc.so.6
diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template
index e50384369e..7d6d18d456 100644
--- a/srcpkgs/libxcb/template
+++ b/srcpkgs/libxcb/template
@@ -4,6 +4,7 @@ version=1.7
 distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-build-docs"
+revision=1
 short_desc="X protocol C-language Binding"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e776dc35e2a66094e7308ce2e045fb4e27cf3ca30ab1813a8fc08538140724df
@@ -20,9 +21,6 @@ long_desc="
  requests and receive responses with both, which eases porting to XCB."
  
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libXdmcp
-Add_dependency run libXau
 Add_dependency build pkg-config
 Add_dependency build python
 Add_dependency build libxslt
diff --git a/srcpkgs/libxml2/libxml2-python.rshlibs b/srcpkgs/libxml2/libxml2-python.rshlibs
new file mode 100644
index 0000000000..8be4c9ce09
--- /dev/null
+++ b/srcpkgs/libxml2/libxml2-python.rshlibs
@@ -0,0 +1,8 @@
+libxml2.so.2
+libz.so.1
+libpthread.so.0
+libdl.so.2
+libutil.so.1
+libm.so.6
+libpython2.7.so.1.0
+libc.so.6
diff --git a/srcpkgs/libxml2/libxml2-python.template b/srcpkgs/libxml2/libxml2-python.template
index 985066afc4..da88c53136 100644
--- a/srcpkgs/libxml2/libxml2-python.template
+++ b/srcpkgs/libxml2/libxml2-python.template
@@ -1,14 +1,11 @@
 # Template file for 'libxml2-python'.
 #
+revision=1
 short_desc="${short_desc} (python extension)"
 long_desc="${long_desc}
 
  This package contains ${sourcepkg} python related files."
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run python
-Add_dependency run libxml2
 
 do_install()
 {
diff --git a/srcpkgs/libxml2/libxml2.rshlibs b/srcpkgs/libxml2/libxml2.rshlibs
new file mode 100644
index 0000000000..cdc8b3d552
--- /dev/null
+++ b/srcpkgs/libxml2/libxml2.rshlibs
@@ -0,0 +1,4 @@
+libc.so.6
+libdl.so.2
+libz.so.1
+libm.so.6
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index aaa2067384..f9f1977189 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,7 +1,7 @@
 # Template build file for 'libxml2'.
 pkgname=libxml2
 version=2.7.8
-revision=1
+revision=2
 distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="Library providing XML and HTML support"
@@ -19,7 +19,5 @@ long_desc="
  URI library."
 
 subpackages="$pkgname-devel $pkgname-python"
-Add_dependency run glibc
-Add_dependency run zlib
 Add_dependency build zlib-devel
 Add_dependency build python-devel
diff --git a/srcpkgs/libxslt/libxslt-python.rshlibs b/srcpkgs/libxslt/libxslt-python.rshlibs
new file mode 100644
index 0000000000..0968c151b5
--- /dev/null
+++ b/srcpkgs/libxslt/libxslt-python.rshlibs
@@ -0,0 +1,8 @@
+libexslt.so.0
+libgcrypt.so.11
+libgpg-error.so.0
+libxslt.so.1
+libxml2.so.2
+libz.so.1
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/libxslt/libxslt-python.template b/srcpkgs/libxslt/libxslt-python.template
index 8f31b87878..63319833e9 100644
--- a/srcpkgs/libxslt/libxslt-python.template
+++ b/srcpkgs/libxslt/libxslt-python.template
@@ -5,15 +5,9 @@ long_desc="${long_desc}
 
  This package contains ${sourcepkg} python related files."
 
-revision=2
+revision=3
 
-Add_dependency run glibc
-Add_dependency run libgpg-error
-Add_dependency run libgcrypt
 Add_dependency run python
-Add_dependency run libxml2
-Add_dependency run zlib
-Add_dependency run libxslt
 
 do_install()
 {
diff --git a/srcpkgs/libxslt/libxslt.rshlibs b/srcpkgs/libxslt/libxslt.rshlibs
new file mode 100644
index 0000000000..5c1cf08628
--- /dev/null
+++ b/srcpkgs/libxslt/libxslt.rshlibs
@@ -0,0 +1,6 @@
+libxml2.so.2
+libc.so.6
+libz.so.1
+libm.so.6
+libgcrypt.so.11
+libgpg-error.so.0
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index 6a5e9f815c..7befdb1bd4 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,7 +1,7 @@
 # Template build file for 'libxslt'.
 pkgname=libxslt
 version=1.1.26
-revision=2
+revision=3
 distfiles="ftp://xmlsoft.org/libxslt/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 short_desc="XSLT parser library from the GNOME project"
@@ -15,11 +15,6 @@ long_desc="
  expressions extensions."
 
 subpackages="$pkgname-devel $pkgname-python"
-Add_dependency run glibc
-Add_dependency run libxml2
-Add_dependency run libgcrypt
-Add_dependency run libgpg-error
-Add_dependency run zlib
 Add_dependency build python-devel
 Add_dependency build libxml2-devel
 Add_dependency build libgcrypt-devel
diff --git a/srcpkgs/llvm/clang.rshlibs b/srcpkgs/llvm/clang.rshlibs
new file mode 100644
index 0000000000..747c7a553d
--- /dev/null
+++ b/srcpkgs/llvm/clang.rshlibs
@@ -0,0 +1,5 @@
+libLLVM-2.9.so
+libpthread.so.0
+libstdc++.so.6
+libgcc_s.so.1
+libc.so.6
diff --git a/srcpkgs/llvm/clang.template b/srcpkgs/llvm/clang.template
index 998eeee190..1fccbdcf01 100644
--- a/srcpkgs/llvm/clang.template
+++ b/srcpkgs/llvm/clang.template
@@ -26,13 +26,9 @@ long_desc="
    * A single unified parser for C, Objective C, C++, and Objective C++
    * Conformance with C/C++/ObjC and their variants"
 
-revision=1
+revision=2
 
-Add_dependency run libgcc
-Add_dependency run glibc
 Add_dependency run libffi
-Add_dependency run libstdc++
-Add_dependency run libllvm
 Add_dependency run llvm
 Add_dependency run gcc ">=4.5"
 
diff --git a/srcpkgs/llvm/libclang.rshlibs b/srcpkgs/llvm/libclang.rshlibs
new file mode 100644
index 0000000000..fbc195ea2c
--- /dev/null
+++ b/srcpkgs/llvm/libclang.rshlibs
@@ -0,0 +1,6 @@
+libLLVM-2.9.so
+libpthread.so.0
+libdl.so.2
+libstdc++.so.6
+libgcc_s.so.1
+libc.so.6
diff --git a/srcpkgs/llvm/libclang.template b/srcpkgs/llvm/libclang.template
index 41e3f0f5cc..2e44d7a398 100644
--- a/srcpkgs/llvm/libclang.template
+++ b/srcpkgs/llvm/libclang.template
@@ -28,13 +28,9 @@ long_desc="
 
  This package includes the shared library used by the Clang frontend."
 
-revision=1
+revision=2
 
-Add_dependency run libgcc
-Add_dependency run glibc
 Add_dependency run libffi
-Add_dependency run libstdc++
-Add_dependency run libllvm
 
 do_install()
 {
diff --git a/srcpkgs/llvm/libllvm.rshlibs b/srcpkgs/llvm/libllvm.rshlibs
new file mode 100644
index 0000000000..36b44f93c1
--- /dev/null
+++ b/srcpkgs/llvm/libllvm.rshlibs
@@ -0,0 +1,7 @@
+libpthread.so.0
+libc.so.6
+libffi.so.5
+libdl.so.2
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/llvm/libllvm.template b/srcpkgs/llvm/libllvm.template
index 1c240fe4b1..c22cffb58e 100644
--- a/srcpkgs/llvm/libllvm.template
+++ b/srcpkgs/llvm/libllvm.template
@@ -6,12 +6,8 @@ long_desc="
 
  This package includes the shared libraries used by the LLVM projects."
 
-revision=1
+revision=2
 
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libffi
-Add_dependency run libstdc++
 
 do_install()
 {
diff --git a/srcpkgs/llvm/llvm.rshlibs b/srcpkgs/llvm/llvm.rshlibs
new file mode 100644
index 0000000000..e9b4e53acd
--- /dev/null
+++ b/srcpkgs/llvm/llvm.rshlibs
@@ -0,0 +1,7 @@
+libLLVM-2.9.so
+libpthread.so.0
+libstdc++.so.6
+libc.so.6
+libdl.so.2
+libm.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index 6d69a4580f..797e4c9951 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm'
 pkgname=llvm
 version=2.9
-revision=1
+revision=2
 distfiles="
 http://www.llvm.org/releases/${version}/llvm-${version}.tgz
 http://www.llvm.org/releases/${version}/clang-${version}.tgz"
@@ -53,12 +53,8 @@ subpackages="libclang clang-analyzer clang clang-devel libllvm"
 subpackages="${subpackages} llvm-devel llvm-docs"
 
 # XXX: Investigate bindings support.
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libstdc++
 Add_dependency run libffi
 Add_dependency run libclang
-Add_dependency run libllvm
 Add_dependency build groff
 Add_dependency build perl
 Add_dependency build python
diff --git a/srcpkgs/logrotate/logrotate.rshlibs b/srcpkgs/logrotate/logrotate.rshlibs
new file mode 100644
index 0000000000..4cab339f25
--- /dev/null
+++ b/srcpkgs/logrotate/logrotate.rshlibs
@@ -0,0 +1,2 @@
+libpopt.so.0
+libc.so.6
diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template
index 18e17f049f..3c76e94c53 100644
--- a/srcpkgs/logrotate/template
+++ b/srcpkgs/logrotate/template
@@ -2,6 +2,7 @@
 pkgname=logrotate
 version=3.8.1
 distfiles="https://fedorahosted.org/releases/l/o/$pkgname/${pkgname}-${version}.tar.gz"
+revision=1
 short_desc="Log file rotation and periodic maintenance"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://fedorahosted.org/logrotate/"
@@ -17,8 +18,6 @@ long_desc="
 
 conf_files="/etc/logrotate.conf"
 
-Add_dependency run glibc
-Add_dependency run popt
 Add_dependency full gzip
 Add_dependency build popt-devel
 
diff --git a/srcpkgs/lzo/lzo.rshlibs b/srcpkgs/lzo/lzo.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/lzo/lzo.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/lzo/template b/srcpkgs/lzo/template
index f434908895..7600b39013 100644
--- a/srcpkgs/lzo/template
+++ b/srcpkgs/lzo/template
@@ -4,6 +4,7 @@ version=2.06
 distfiles="http://www.oberhumer.com/opensource/lzo/download/lzo-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-shared=yes"
+revision=1
 short_desc="Portable lossless data compression library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.oberhumer.com/opensource/lzo"
@@ -19,4 +20,3 @@ long_desc="
  very high speed."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
diff --git a/srcpkgs/makedepend/makedepend.rshlibs b/srcpkgs/makedepend/makedepend.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/makedepend/makedepend.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/makedepend/template b/srcpkgs/makedepend/template
index 104dc0c93a..f3a6074edc 100644
--- a/srcpkgs/makedepend/template
+++ b/srcpkgs/makedepend/template
@@ -3,6 +3,7 @@ pkgname=makedepend
 version=1.0.1
 distfiles="${XORG_SITE}/util/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="A dependency generator for makefiles"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b752ad9f210f82d480c8bf397d62649a4306a5534bc38ae7765b9bfbd416b1d2
@@ -16,6 +17,5 @@ long_desc="
  directives can reference files having other include directives, and parsing
  will occur in these files as well."
 
-Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build xproto
diff --git a/srcpkgs/man-db/man-db.rshlibs b/srcpkgs/man-db/man-db.rshlibs
new file mode 100644
index 0000000000..d604b87d74
--- /dev/null
+++ b/srcpkgs/man-db/man-db.rshlibs
@@ -0,0 +1,4 @@
+libgdbm.so.3
+libc.so.6
+libpipeline.so.1
+libz.so.1
diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template
index 3db6ac91e0..da6feaf6f9 100644
--- a/srcpkgs/man-db/template
+++ b/srcpkgs/man-db/template
@@ -7,6 +7,7 @@ configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip
 --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix
 --with-lzma=/usr/bin/lzma --with-xz=/usr/bin/xz --disable-setuid
 --without-included-regex --enable-automatic-create" 
+revision=1
 short_desc="The on-line manual database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=537bdb60b12c7d34aa21c397024a6d604c5130b61f9aff5554ab443329b728a7
@@ -19,10 +20,6 @@ long_desc="
 
 conf_files="/etc/man_db.conf"
 
-Add_dependency run glibc
-Add_dependency run gdbm
-Add_dependency run zlib
-Add_dependency run libpipeline
 
 Add_dependency build pkg-config
 Add_dependency build gettext
diff --git a/srcpkgs/mercurial/mercurial.rshlibs b/srcpkgs/mercurial/mercurial.rshlibs
new file mode 100644
index 0000000000..614278798c
--- /dev/null
+++ b/srcpkgs/mercurial/mercurial.rshlibs
@@ -0,0 +1,3 @@
+libpython2.7.so.1.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 61ce2fb5bb..6c72f79b18 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -4,6 +4,7 @@ version=1.9.3
 homepage="http://mercurial.selenic.com"
 distfiles="$homepage/release/$pkgname-$version.tar.gz"
 build_style=python-module
+revision=1
 short_desc="Fast, lightweight source control management system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -50,8 +51,6 @@ long_desc="
 
 pycompile_module="$pkgname hgext"
 
-Add_dependency run glibc
-Add_dependency run python
 Add_dependency build gettext
 Add_dependency build python-devel
 
diff --git a/srcpkgs/mit-krb5/mit-krb5-client.rshlibs b/srcpkgs/mit-krb5/mit-krb5-client.rshlibs
new file mode 100644
index 0000000000..cf2727b1c0
--- /dev/null
+++ b/srcpkgs/mit-krb5/mit-krb5-client.rshlibs
@@ -0,0 +1,10 @@
+libkadm5srv_mit.so.8
+libkdb5.so.5
+libkrb5.so.3
+libcom_err.so.2
+libc.so.6
+libss.so.2
+libkadm5clnt_mit.so.8
+libk5crypto.so.3
+libkrb5support.so.0
+libgssapi_krb5.so.2
diff --git a/srcpkgs/mit-krb5/mit-krb5-client.template b/srcpkgs/mit-krb5/mit-krb5-client.template
index 94664ae10a..b0289ef328 100644
--- a/srcpkgs/mit-krb5/mit-krb5-client.template
+++ b/srcpkgs/mit-krb5/mit-krb5-client.template
@@ -1,13 +1,11 @@
 # Template file for 'mit-krb5-client'.
 #
+revision=1
 short_desc="${short_desc} - client programs"
 long_desc="${long_desc}
 
  This package contains the client side programs."
 
-Add_dependency run glibc
-Add_dependency run e2fsprogs-libs
-Add_dependency run mit-krb5-libs
 
 do_install()
 {
diff --git a/srcpkgs/mit-krb5/mit-krb5-libs.rshlibs b/srcpkgs/mit-krb5/mit-krb5-libs.rshlibs
new file mode 100644
index 0000000000..07bd174fc0
--- /dev/null
+++ b/srcpkgs/mit-krb5/mit-krb5-libs.rshlibs
@@ -0,0 +1,5 @@
+libkrb5.so.3
+libcom_err.so.2
+libdl.so.2
+libresolv.so.2
+libc.so.6
diff --git a/srcpkgs/mit-krb5/mit-krb5-libs.template b/srcpkgs/mit-krb5/mit-krb5-libs.template
index 7aca6cf5ce..552b8a8e1f 100644
--- a/srcpkgs/mit-krb5/mit-krb5-libs.template
+++ b/srcpkgs/mit-krb5/mit-krb5-libs.template
@@ -1,5 +1,6 @@
 # Template file for 'mit-krb5-libs'.
 #
+revision=1
 short_desc="${short_desc} - shared libraries"
 long_desc="${long_desc}
 
@@ -7,8 +8,6 @@ long_desc="${long_desc}
 
 conflicts="heimdal-libs>=0"
 
-Add_dependency run glibc
-Add_dependency run e2fsprogs-libs
 
 do_install()
 {
diff --git a/srcpkgs/mit-krb5/mit-krb5.rshlibs b/srcpkgs/mit-krb5/mit-krb5.rshlibs
new file mode 100644
index 0000000000..b9665312f7
--- /dev/null
+++ b/srcpkgs/mit-krb5/mit-krb5.rshlibs
@@ -0,0 +1,16 @@
+libkrb5.so.3
+libcom_err.so.2
+libc.so.6
+libkadm5srv_mit.so.8
+libkdb5.so.5
+libgssrpc.so.4
+libgssapi_krb5.so.2
+libk5crypto.so.3
+libkrb5support.so.0
+libpthread.so.0
+libkadm5clnt_mit.so.8
+libss.so.2
+libdb-4.8.so
+libresolv.so.2
+libdl.so.2
+libcrypto.so.1
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index a976d655b3..23b58846e2 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -8,6 +8,7 @@ build_style=gnu-configure
 configure_script="./src/configure"
 configure_args="--disable-rpath --enable-kdc-replay-cache --with-system-et
 --with-system-ss --with-system-db --enable-shared CFLAGS=-I/usr/include/et"
+revision=1
 short_desc="MIT Kerberos 5 implementation"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
@@ -23,11 +24,6 @@ noextract=yes
 subpackages="$pkgname-devel $pkgname-libs $pkgname-client"
 conflicts="heimdal>=0"
 
-Add_dependency run glibc
-Add_dependency run libdb
-Add_dependency run e2fsprogs-libs
-Add_dependency run libssl
-Add_dependency run mit-krb5-libs
 Add_dependency run mit-krb5-client
 
 Add_dependency build perl ">=0"
diff --git a/srcpkgs/module-init-tools/module-init-tools.rshlibs b/srcpkgs/module-init-tools/module-init-tools.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/module-init-tools/module-init-tools.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/module-init-tools/template b/srcpkgs/module-init-tools/template
index ce54127b05..bba4dd82ff 100644
--- a/srcpkgs/module-init-tools/template
+++ b/srcpkgs/module-init-tools/template
@@ -2,6 +2,7 @@
 pkgname=module-init-tools
 version=3.16
 distfiles="${KERNEL_SITE}//utils/kernel/$pkgname/$pkgname-$version.tar.bz2"
+revision=1
 short_desc="Tools for managing kernel modules"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://kerneltools.org"
@@ -12,7 +13,6 @@ long_desc="
  needed by Linux systems for managing loadable Linux Kernel Modules. This
  includes depmod, insmod, rmmod, modprobe and tools like modinfo."
 
-Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency build zlib-devel
 Add_dependency build docbook2x
diff --git a/srcpkgs/mysql/libmysqlclient.rshlibs b/srcpkgs/mysql/libmysqlclient.rshlibs
new file mode 100644
index 0000000000..a9be04d8eb
--- /dev/null
+++ b/srcpkgs/mysql/libmysqlclient.rshlibs
@@ -0,0 +1,8 @@
+libpthread.so.0
+libcrypt.so.1
+libnsl.so.1
+libm.so.6
+libz.so.1
+libssl.so.1
+libcrypto.so.1
+libc.so.6
diff --git a/srcpkgs/mysql/libmysqlclient.template b/srcpkgs/mysql/libmysqlclient.template
index 91fca0070f..fdfaa885cc 100644
--- a/srcpkgs/mysql/libmysqlclient.template
+++ b/srcpkgs/mysql/libmysqlclient.template
@@ -1,13 +1,11 @@
 # Template file for 'libmysqlclient'.
 #
+revision=1
 short_desc="MySQL database client library"
 long_desc="${long_desc}
 
  This package includes the client library."
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libssl
 
 do_install()
 {
diff --git a/srcpkgs/mysql/libndbclient.rshlibs b/srcpkgs/mysql/libndbclient.rshlibs
new file mode 100644
index 0000000000..a2679a4b5b
--- /dev/null
+++ b/srcpkgs/mysql/libndbclient.rshlibs
@@ -0,0 +1,5 @@
+libpthread.so.0
+libcrypt.so.1
+libnsl.so.1
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/mysql/libndbclient.template b/srcpkgs/mysql/libndbclient.template
index 7a3960109c..789f9383ec 100644
--- a/srcpkgs/mysql/libndbclient.template
+++ b/srcpkgs/mysql/libndbclient.template
@@ -1,11 +1,11 @@
 # Template file for 'libndbclient'.
 #
+revision=1
 short_desc="MySQL NDB (Network Database) client library"
 long_desc="${long_desc}
 
  This package includes the NDB client library."
 
-Add_dependency run glibc
 Add_dependency run zlib
 
 do_install()
diff --git a/srcpkgs/mysql/mysql-client.rshlibs b/srcpkgs/mysql/mysql-client.rshlibs
new file mode 100644
index 0000000000..b1cd8fc9fa
--- /dev/null
+++ b/srcpkgs/mysql/mysql-client.rshlibs
@@ -0,0 +1,14 @@
+libpthread.so.0
+libssl.so.1
+libcrypto.so.1
+libz.so.1
+libstdc++.so.6
+libgcc_s.so.1
+libc.so.6
+libmysqlclient_r.so.16
+libmysqlclient.so.16
+libm.so.6
+libdl.so.2
+libcrypt.so.1
+libwrap.so.0
+libreadline.so.6
diff --git a/srcpkgs/mysql/mysql-client.template b/srcpkgs/mysql/mysql-client.template
index a6a1376c25..1c8cb41985 100644
--- a/srcpkgs/mysql/mysql-client.template
+++ b/srcpkgs/mysql/mysql-client.template
@@ -6,17 +6,9 @@ long_desc="${long_desc}
  This package includes the client binaries and the additional tools
  innotop and mysqlreport."
 
-revision=1
+revision=2
 
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libstdc++
 Add_dependency run ncurses-libs
-Add_dependency run libmysqlclient
-Add_dependency run zlib
-Add_dependency run tcp_wrappers-libs
-Add_dependency run readline
-Add_dependency run libssl
 Add_dependency run perl			">=0"
 
 do_install()
diff --git a/srcpkgs/mysql/mysql-ndb.rshlibs b/srcpkgs/mysql/mysql-ndb.rshlibs
new file mode 100644
index 0000000000..20e4c89653
--- /dev/null
+++ b/srcpkgs/mysql/mysql-ndb.rshlibs
@@ -0,0 +1,7 @@
+libpthread.so.0
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
+libc.so.6
+libreadline.so.6
+libz.so.1
diff --git a/srcpkgs/mysql/mysql-ndb.template b/srcpkgs/mysql/mysql-ndb.template
index f93020df23..9d06985e53 100644
--- a/srcpkgs/mysql/mysql-ndb.template
+++ b/srcpkgs/mysql/mysql-ndb.template
@@ -6,14 +6,9 @@ long_desc="${long_desc}
  This package includes the binaries for the MySQL NDB (Network Database)
  component."
 
-revision=1
+revision=2
 
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libstdc++
 Add_dependency run ncurses-libs
-Add_dependency run zlib
-Add_dependency run readline
 
 do_install()
 {
diff --git a/srcpkgs/mysql/mysql.rshlibs b/srcpkgs/mysql/mysql.rshlibs
new file mode 100644
index 0000000000..5c3d695555
--- /dev/null
+++ b/srcpkgs/mysql/mysql.rshlibs
@@ -0,0 +1,12 @@
+libpthread.so.0
+libz.so.1
+libwrap.so.0
+libdl.so.2
+libssl.so.1
+libcrypto.so.1
+libcrypt.so.1
+libstdc++.so.6
+libm.so.6
+libgcc_s.so.1
+libc.so.6
+libnsl.so.1
diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template
index 11ce22646f..ee2f3bbbbc 100644
--- a/srcpkgs/mysql/template
+++ b/srcpkgs/mysql/template
@@ -12,6 +12,7 @@ configure_args="--sysconfdir=/etc/mysql
 --with-plugins=all --with-embedded-privilege-control --with-mysqlmanager
 --with-mysqld-user=mysqld --enable-thread-safe-client
 --libexecdir=/usr/sbin --without-readline"
+revision=1
 short_desc="The world's most popular open source database"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=84370fffc4fe277645fb3a5040d153ff567576b664f0663452be077826b7ab1f
@@ -39,12 +40,6 @@ openrc_services="mysqld default false"
 system_accounts="mysqld"
 mysqld_homedir="/var/lib/mysql"
 
-Add_dependency run glibc
-Add_dependency run libgcc
-Add_dependency run libstdc++
-Add_dependency run zlib
-Add_dependency run tcp_wrappers-libs
-Add_dependency run libssl
 Add_dependency run mysql-client
 
 Add_dependency build libstdc++-devel
diff --git a/srcpkgs/ntfs-3g/ntfs-3g.rshlibs b/srcpkgs/ntfs-3g/ntfs-3g.rshlibs
new file mode 100644
index 0000000000..07388754b0
--- /dev/null
+++ b/srcpkgs/ntfs-3g/ntfs-3g.rshlibs
@@ -0,0 +1,4 @@
+libc.so.6
+libuuid.so.1
+libfuse.so.2
+libpthread.so.0
diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template
index c0bdca2fe1..fd20424579 100644
--- a/srcpkgs/ntfs-3g/template
+++ b/srcpkgs/ntfs-3g/template
@@ -5,6 +5,7 @@ wrksrc=${pkgname}_ntfsprogs-${version}
 distfiles="http://www.tuxera.com/opensource/${pkgname}_ntfsprogs-${version}.tgz"
 build_style=gnu-configure
 configure_args="--bindir=/bin --disable-static --with-fuse=external"
+revision=1
 short_desc="Stable Read/Write NTFS Driver in userspace"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=aa8c747f0bfe819b2387b05e12db8d35e4ac96dcb2432873a0b939e248b2ee05
@@ -18,9 +19,6 @@ long_desc="
 replaces="ntfsprogs>=0"
 subpackages="$pkgname-devel"
 
-Add_dependency run glibc
-Add_dependency run libuuid
-Add_dependency run fuse
 
 Add_dependency build pkg-config
 Add_dependency build libuuid-devel
diff --git a/srcpkgs/ntp/ntp.rshlibs b/srcpkgs/ntp/ntp.rshlibs
new file mode 100644
index 0000000000..6271775e3e
--- /dev/null
+++ b/srcpkgs/ntp/ntp.rshlibs
@@ -0,0 +1,5 @@
+libc.so.6
+libcrypto.so.1
+librt.so.1
+libm.so.6
+libcap.so.2
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index 59a2038071..eebe54d3a6 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,7 +1,7 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.6p4
-revision=4
+revision=5
 homepage="http://www.ntp.org/"
 distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$version.tar.gz"
 build_style=gnu-configure
@@ -20,10 +20,7 @@ subpackages="$pkgname-perl"
 conf_files="/etc/ntp.conf"
 systemd_services="ntpd.service on"
 
-Add_dependency run glibc
 Add_dependency run readline
-Add_dependency run libssl
-Add_dependency run libcap
 
 Add_dependency build readline-devel
 Add_dependency build openssl-devel
diff --git a/srcpkgs/openssh/openssh-client.rshlibs b/srcpkgs/openssh/openssh-client.rshlibs
new file mode 100644
index 0000000000..0efc53c5b7
--- /dev/null
+++ b/srcpkgs/openssh/openssh-client.rshlibs
@@ -0,0 +1,6 @@
+libc.so.6
+libcrypto.so.1
+libz.so.1
+libresolv.so.2
+libdl.so.2
+libgssapi_krb5.so.2
diff --git a/srcpkgs/openssh/openssh-client.template b/srcpkgs/openssh/openssh-client.template
index 0de62a50b3..ee1cf7f614 100644
--- a/srcpkgs/openssh/openssh-client.template
+++ b/srcpkgs/openssh/openssh-client.template
@@ -1,5 +1,6 @@
 # Template file for 'openssh-client'.
 #
+revision=1
 short_desc="The OpenSSH client"
 long_desc="${long_desc}
 
@@ -7,10 +8,6 @@ long_desc="${long_desc}
 
 conf_files="/etc/ssh/ssh_config"
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libssl
-Add_dependency run mit-krb5-libs
 Add_dependency run openssh		">=${version}"
 
 do_install()
diff --git a/srcpkgs/openssh/openssh-server.rshlibs b/srcpkgs/openssh/openssh-server.rshlibs
new file mode 100644
index 0000000000..34df1f53f3
--- /dev/null
+++ b/srcpkgs/openssh/openssh-server.rshlibs
@@ -0,0 +1,10 @@
+libwrap.so.0
+libpam.so.0
+libcrypto.so.1
+libutil.so.1
+libz.so.1
+libcrypt.so.1
+libgssapi_krb5.so.2
+libkrb5.so.3
+libcom_err.so.2
+libc.so.6
diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index 7853d68111..b04298c2b5 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -5,18 +5,11 @@ long_desc="${long_desc}
 
  This package contains the ${pkgname} server files."
 
-revision=3
+revision=4
 
 conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
 systemd_services="sshd.service on sshdgenkeys.service on"
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libssl
-Add_dependency run pam
-Add_dependency run tcp_wrappers-libs
-Add_dependency run mit-krb5-libs
-Add_dependency run e2fsprogs-libs
 Add_dependency run openssh		">=${version}"
 
 do_install()
diff --git a/srcpkgs/openssh/openssh.rshlibs b/srcpkgs/openssh/openssh.rshlibs
new file mode 100644
index 0000000000..5cd9348863
--- /dev/null
+++ b/srcpkgs/openssh/openssh.rshlibs
@@ -0,0 +1,5 @@
+libresolv.so.2
+libcrypto.so.1
+libdl.so.2
+libc.so.6
+libz.so.1
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 9c3601fbf2..65674ab3ca 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -8,6 +8,7 @@ configure_args="--libexecdir=/usr/libexec/openssh --with-tcp-wrappers
 --with-privsep-user=nobody --with-pam --with-mantype=man --without-rpath
 --with-xauth=/usr/bin/xauth --with-ssl-engine --disable-strip
 --with-privsep-path=/var/chroot/ssh --with-kerberos5=/usr"
+revision=1
 short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openssh.org"
@@ -31,9 +32,6 @@ long_desc="
 conf_files="/etc/ssh/moduli"
 subpackages="$pkgname-client $pkgname-server"
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libssl
 Add_dependency run shadow
 
 Add_dependency build perl ">=0"
diff --git a/srcpkgs/openssl/libssl.rshlibs b/srcpkgs/openssl/libssl.rshlibs
new file mode 100644
index 0000000000..ffdb45be14
--- /dev/null
+++ b/srcpkgs/openssl/libssl.rshlibs
@@ -0,0 +1,3 @@
+libdl.so.2
+libz.so.1
+libc.so.6
diff --git a/srcpkgs/openssl/libssl.template b/srcpkgs/openssl/libssl.template
index 5e791f448b..34e211e374 100644
--- a/srcpkgs/openssl/libssl.template
+++ b/srcpkgs/openssl/libssl.template
@@ -1,5 +1,6 @@
 # Template file for 'libssl'.
 #
+revision=1
 short_desc="Secure Sockets Layer and Cryptographic library"
 long_desc="
  ${long_desc}
@@ -8,8 +9,6 @@ long_desc="
 
 replaces="openssl<1.0.0a_2"
 
-Add_dependency run glibc
-Add_dependency run zlib
 
 do_install()
 {
diff --git a/srcpkgs/openssl/openssl.rshlibs b/srcpkgs/openssl/openssl.rshlibs
new file mode 100644
index 0000000000..c3c70afde1
--- /dev/null
+++ b/srcpkgs/openssl/openssl.rshlibs
@@ -0,0 +1,5 @@
+libssl.so.1
+libcrypto.so.1
+libdl.so.2
+libz.so.1
+libc.so.6
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 2e9bf5fe51..b0e5afe125 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -4,6 +4,7 @@ _openssl_version=1.0.0
 version=${_openssl_version}e
 homepage="http://www.openssl.org/"
 distfiles="${homepage}/source/$pkgname-$version.tar.gz"
+revision=1
 short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
@@ -19,9 +20,6 @@ disable_parallel_build=yes
 conf_files="/etc/ssl/openssl.cnf"
 subpackages="libssl openssl-devel"
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libssl
 Add_dependency full perl	">=0"
 Add_dependency build zlib-devel
 
diff --git a/srcpkgs/pam/pam-userdb.rshlibs b/srcpkgs/pam/pam-userdb.rshlibs
new file mode 100644
index 0000000000..01344822a8
--- /dev/null
+++ b/srcpkgs/pam/pam-userdb.rshlibs
@@ -0,0 +1,5 @@
+libpam.so.0
+libdl.so.2
+libdb-4.8.so
+libcrypt.so.1
+libc.so.6
diff --git a/srcpkgs/pam/pam-userdb.template b/srcpkgs/pam/pam-userdb.template
index c8e4251a82..9ab5d85cc8 100644
--- a/srcpkgs/pam/pam-userdb.template
+++ b/srcpkgs/pam/pam-userdb.template
@@ -1,5 +1,6 @@
 # Template file for 'pam-userdb'.
 #
+revision=1
 short_desc="PAM module to authenticate against a db database"
 long_desc="${long_desc}
 
@@ -8,9 +9,6 @@ long_desc="${long_desc}
  username, and the data fields corresponding to the username keys are the
  passwords."
 
-Add_dependency run glibc
-Add_dependency run libdb
-Add_dependency run pam
 
 do_install()
 {
diff --git a/srcpkgs/pam/pam.rshlibs b/srcpkgs/pam/pam.rshlibs
new file mode 100644
index 0000000000..5f9b7b57c2
--- /dev/null
+++ b/srcpkgs/pam/pam.rshlibs
@@ -0,0 +1,6 @@
+libcrypt.so.1
+libc.so.6
+libdl.so.2
+libnsl.so.1
+libutil.so.1
+libcrack.so.2
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index fcbcdeb28f..a16c9e8e36 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -4,6 +4,7 @@ version=1.1.5
 wrksrc="Linux-PAM-$version"
 #distfiles="${KERNEL_SITE}/libs/pam/library/Linux-PAM-$version.tar.bz2"
 distfiles="https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$version.tar.bz2"
+revision=1
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/libs/pam/"
@@ -23,8 +24,6 @@ conf_files="
 /etc/security/time.conf"
 subpackages="pam-devel pam-userdb"
 
-Add_dependency run glibc
-Add_dependency run cracklib
 Add_dependency build flex
 Add_dependency build gettext
 Add_dependency build cracklib-devel
diff --git a/srcpkgs/pango/pango.rshlibs b/srcpkgs/pango/pango.rshlibs
new file mode 100644
index 0000000000..e88edc1ce9
--- /dev/null
+++ b/srcpkgs/pango/pango.rshlibs
@@ -0,0 +1,14 @@
+libgobject-2.0.so.0
+libgmodule-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libXft.so.2
+libX11.so.6
+libfontconfig.so.1
+libcairo.so.2
+libgthread-2.0.so.0
+librt.so.1
+libm.so.6
+libfreetype.so.6
+libXrender.so.1
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index cbc796db35..bfe89270f4 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -3,6 +3,7 @@ pkgname=pango
 version=1.29.4
 distfiles="${GNOME_SITE}/pango/1.29/$pkgname-$version.tar.xz"
 build_style=gnu-configure
+revision=1
 short_desc="Library for layout and rendering of text"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pango.org/"
@@ -33,14 +34,6 @@ long_desc="
 subpackages="pango-devel"
 triggers="pango-modules"
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run cairo
-Add_dependency run fontconfig
-Add_dependency run freetype
-Add_dependency run libX11
-Add_dependency run libXft
-Add_dependency run libXrender
 
 Add_dependency build pkg-config
 Add_dependency build glib-devel
diff --git a/srcpkgs/pciutils/pciutils.rshlibs b/srcpkgs/pciutils/pciutils.rshlibs
new file mode 100644
index 0000000000..903a30afaa
--- /dev/null
+++ b/srcpkgs/pciutils/pciutils.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libresolv.so.2
diff --git a/srcpkgs/pciutils/template b/srcpkgs/pciutils/template
index ffd2ec2681..c48edd241a 100644
--- a/srcpkgs/pciutils/template
+++ b/srcpkgs/pciutils/template
@@ -3,6 +3,7 @@ pkgname=pciutils
 version=3.1.8
 homepage="http://mj.ucw.cz/pciutils.html"
 distfiles="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${version}.tar.gz"
+revision=1
 short_desc="PCI bus related utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -12,7 +13,6 @@ long_desc="
  setting devices connected to the PCI bus."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency build wget
 
 do_build() {
diff --git a/srcpkgs/pcre/libpcre.rshlibs b/srcpkgs/pcre/libpcre.rshlibs
new file mode 100644
index 0000000000..d2b712aef4
--- /dev/null
+++ b/srcpkgs/pcre/libpcre.rshlibs
@@ -0,0 +1,4 @@
+libstdc++.so.6
+libm.so.6
+libc.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/pcre/libpcre.template b/srcpkgs/pcre/libpcre.template
index b0a8cd7b66..780afbdf8e 100644
--- a/srcpkgs/pcre/libpcre.template
+++ b/srcpkgs/pcre/libpcre.template
@@ -1,5 +1,6 @@
 # Template file for 'libpcre'.
 #
+revision=1
 short_desc="${short_desc} - shared libraries"
 long_desc="${long_desc}
 
@@ -7,9 +8,6 @@ long_desc="${long_desc}
 
 replaces="pcre<8.11"
 
-Add_dependency run libgcc
-Add_dependency run glibc
-Add_dependency run libstdc++
 
 do_install()
 {
diff --git a/srcpkgs/pcre/pcre.rshlibs b/srcpkgs/pcre/pcre.rshlibs
new file mode 100644
index 0000000000..3166c2801d
--- /dev/null
+++ b/srcpkgs/pcre/pcre.rshlibs
@@ -0,0 +1,5 @@
+libpcre.so.0
+libz.so.1
+libbz2.so.1
+libc.so.6
+libpcreposix.so.0
diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template
index 1cc9c17b3f..877047986b 100644
--- a/srcpkgs/pcre/template
+++ b/srcpkgs/pcre/template
@@ -5,6 +5,7 @@ distfiles="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.t
 build_style=gnu-configure
 configure_args="--enable-utf8 --enable-unicode-properties
 --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-newline-is-anycrlf"
+revision=1
 short_desc="Perl Compatible Regular Expressions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.pcre.org/"
@@ -19,9 +20,5 @@ long_desc="
 
 subpackages="libpcre pcre-devel"
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run bzip2
-Add_dependency run libpcre
 Add_dependency build zlib-devel
 Add_dependency build bzip2-devel
diff --git a/srcpkgs/perl-XML-Parser/perl-XML-Parser.rshlibs b/srcpkgs/perl-XML-Parser/perl-XML-Parser.rshlibs
new file mode 100644
index 0000000000..ce10bdc9f7
--- /dev/null
+++ b/srcpkgs/perl-XML-Parser/perl-XML-Parser.rshlibs
@@ -0,0 +1,2 @@
+libexpat.so.1
+libc.so.6
diff --git a/srcpkgs/perl-XML-Parser/template b/srcpkgs/perl-XML-Parser/template
index 452142787f..7aa00e8744 100644
--- a/srcpkgs/perl-XML-Parser/template
+++ b/srcpkgs/perl-XML-Parser/template
@@ -4,6 +4,7 @@ version=2.40
 wrksrc="XML-Parser-$version"
 distfiles="${CPAN_SITE}/XML/XML-Parser-$version.tar.gz"
 build_style=perl-module
+revision=1
 short_desc="Perl extension interface to James Clark's XML parser, expat"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e5e433684e799ef7b6b852c0ca31b71054717628555444d3dc9fceac0df71512
@@ -12,7 +13,5 @@ long_desc="
  XML::Parser::Expat, which is a lower level interface to James Clark's
  expat library."
 
-Add_dependency run glibc
-Add_dependency run expat
 Add_dependency full perl	">=5.14.0"
 Add_dependency build expat-devel
diff --git a/srcpkgs/perl/perl.rshlibs b/srcpkgs/perl/perl.rshlibs
new file mode 100644
index 0000000000..28c5932683
--- /dev/null
+++ b/srcpkgs/perl/perl.rshlibs
@@ -0,0 +1,10 @@
+libnsl.so.1
+libdl.so.2
+libm.so.6
+libcrypt.so.1
+libutil.so.1
+libpthread.so.0
+libc.so.6
+libdb-4.8.so
+libgdbm.so.3
+librt.so.1
diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index 707fd0d643..0e36340151 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -2,6 +2,7 @@
 pkgname=perl
 version=5.14.2
 distfiles="http://www.cpan.org/src/5.0/$pkgname-$version.tar.bz2"
+revision=1
 short_desc="Practical Extraction and Report Language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.perl.org"
@@ -18,9 +19,6 @@ long_desc="
  support for text processing, and has one of the world's most impressive
  collections of third-party modules."
 
-Add_dependency run glibc
-Add_dependency run gdbm
-Add_dependency run libdb
 Add_dependency build gdbm-devel
 Add_dependency build db-devel
 Add_dependency build less
diff --git a/srcpkgs/pixman/pixman.rshlibs b/srcpkgs/pixman/pixman.rshlibs
new file mode 100644
index 0000000000..8dd4450c3c
--- /dev/null
+++ b/srcpkgs/pixman/pixman.rshlibs
@@ -0,0 +1,3 @@
+libm.so.6
+libc.so.6
+ld-linux.so.2
diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template
index 9dfd9479c5..32209f727b 100644
--- a/srcpkgs/pixman/template
+++ b/srcpkgs/pixman/template
@@ -4,6 +4,7 @@ version=0.24.0
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--disable-gtk" # do not require gtk+!
+revision=1
 short_desc="Library of low-level pixel manipulation routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org"
@@ -13,7 +14,6 @@ long_desc="
  Pixel manipulation library for modular X.org."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build perl
 
diff --git a/srcpkgs/pkg-config/pkg-config.rshlibs b/srcpkgs/pkg-config/pkg-config.rshlibs
new file mode 100644
index 0000000000..4cab339f25
--- /dev/null
+++ b/srcpkgs/pkg-config/pkg-config.rshlibs
@@ -0,0 +1,2 @@
+libpopt.so.0
+libc.so.6
diff --git a/srcpkgs/pkg-config/template b/srcpkgs/pkg-config/template
index 5db58c338e..0ca0dc6d2c 100644
--- a/srcpkgs/pkg-config/template
+++ b/srcpkgs/pkg-config/template
@@ -4,6 +4,7 @@ version=0.25
 distfiles="http://pkgconfig.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-installed-popt"
+revision=1
 short_desc="System for managing library compile/link flags"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e
@@ -12,6 +13,4 @@ long_desc="
  works with automake and autoconf.  It replaces the ubiquitous
  *-config scripts you may have seen with a single tool."
 
-Add_dependency run glibc
-Add_dependency run popt
 Add_dependency build popt-devel
diff --git a/srcpkgs/polkit/polkit.rshlibs b/srcpkgs/polkit/polkit.rshlibs
new file mode 100644
index 0000000000..f5f7c62e70
--- /dev/null
+++ b/srcpkgs/polkit/polkit.rshlibs
@@ -0,0 +1,10 @@
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libpam.so.0
+libgio-2.0.so.0
+libgmodule-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libexpat.so.1
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 6c4f27d086..3f323207dc 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit'
 pkgname=polkit
 version=0.102
-revision=4
+revision=5
 distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static --with-os-type=gentoo"
@@ -22,10 +22,6 @@ systemd_services="polkitd.service on"
 replaces="PolicyKit>=0"
 subpackages="polkit-devel"
 
-Add_dependency run glib
-Add_dependency run glibc
-Add_dependency run expat
-Add_dependency run pam
 
 Add_dependency build pkg-config
 Add_dependency build intltool
diff --git a/srcpkgs/popt/popt.rshlibs b/srcpkgs/popt/popt.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/popt/popt.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/popt/template b/srcpkgs/popt/template
index 9a22fbe954..7dfec3da2b 100644
--- a/srcpkgs/popt/template
+++ b/srcpkgs/popt/template
@@ -4,6 +4,7 @@ version=1.16
 distfiles="http://rpm5.org/files/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-rpath"
+revision=1
 short_desc="Command line option parsing library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8
@@ -16,4 +17,3 @@ long_desc="
  option filters, and automatic generation of help and usage messages."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
diff --git a/srcpkgs/postgresql/postgresql-client.rshlibs b/srcpkgs/postgresql/postgresql-client.rshlibs
new file mode 100644
index 0000000000..57dd98961f
--- /dev/null
+++ b/srcpkgs/postgresql/postgresql-client.rshlibs
@@ -0,0 +1,5 @@
+libpq.so.5
+libssl.so.1
+libreadline.so.6
+libc.so.6
+libz.so.1
diff --git a/srcpkgs/postgresql/postgresql-client.template b/srcpkgs/postgresql/postgresql-client.template
index 2a55d825d8..ca0a44d7e3 100644
--- a/srcpkgs/postgresql/postgresql-client.template
+++ b/srcpkgs/postgresql/postgresql-client.template
@@ -1,5 +1,6 @@
 # Template file for 'postgresql-client'.
 #
+revision=1
 short_desc="Client frontends programs for PostgreSQL"
 long_desc="${long_desc}
 
@@ -12,12 +13,7 @@ long_desc="${long_desc}
  On a network, you can install this package on many client machines, while
  the server package may be installed on only one machine."
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libssl
-Add_dependency run readline
 Add_dependency run libxslt
-Add_dependency run postgresql-libs
 
 do_install()
 {
diff --git a/srcpkgs/postgresql/postgresql-libs-devel.rshlibs b/srcpkgs/postgresql/postgresql-libs-devel.rshlibs
new file mode 100644
index 0000000000..5c5d2ae913
--- /dev/null
+++ b/srcpkgs/postgresql/postgresql-libs-devel.rshlibs
@@ -0,0 +1,2 @@
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/postgresql/postgresql-libs-devel.template b/srcpkgs/postgresql/postgresql-libs-devel.template
index 99ecd29a2f..d22b96534f 100644
--- a/srcpkgs/postgresql/postgresql-libs-devel.template
+++ b/srcpkgs/postgresql/postgresql-libs-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'postgresql-libs-devel'.
 #
+revision=1
 short_desc="PostgreSQL shared libraries (development files)"
 long_desc="${long_desc}
 
  This package provides the development files required to build any
  PostgreSQL application."
 
-Add_dependency run glibc
 Add_dependency run postgresql-libs
 
 do_install()
diff --git a/srcpkgs/postgresql/postgresql-libs.rshlibs b/srcpkgs/postgresql/postgresql-libs.rshlibs
new file mode 100644
index 0000000000..9018c0ad5c
--- /dev/null
+++ b/srcpkgs/postgresql/postgresql-libs.rshlibs
@@ -0,0 +1,6 @@
+libm.so.6
+libpthread.so.0
+libc.so.6
+libssl.so.1
+libcrypto.so.1
+libcrypt.so.1
diff --git a/srcpkgs/postgresql/postgresql-libs.template b/srcpkgs/postgresql/postgresql-libs.template
index 7b2f8c6cbe..7fde7659b4 100644
--- a/srcpkgs/postgresql/postgresql-libs.template
+++ b/srcpkgs/postgresql/postgresql-libs.template
@@ -1,12 +1,11 @@
 # Template file for 'postgresql-libs'.
 #
+revision=1
 short_desc="PostgreSQL shared libraries"
 long_desc="${long_desc}
 
  This package provides the shared libraries used by PostgreSQL applications."
 
-Add_dependency run glibc
-Add_dependency run libssl
 
 do_install()
 {
diff --git a/srcpkgs/postgresql/postgresql-plperl.rshlibs b/srcpkgs/postgresql/postgresql-plperl.rshlibs
new file mode 100644
index 0000000000..ec105e3019
--- /dev/null
+++ b/srcpkgs/postgresql/postgresql-plperl.rshlibs
@@ -0,0 +1,8 @@
+libperl.so
+libnsl.so.1
+libdl.so.2
+libm.so.6
+libcrypt.so.1
+libutil.so.1
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/postgresql/postgresql-plperl.template b/srcpkgs/postgresql/postgresql-plperl.template
index 42fe197217..2ccd53c368 100644
--- a/srcpkgs/postgresql/postgresql-plperl.template
+++ b/srcpkgs/postgresql/postgresql-plperl.template
@@ -1,5 +1,6 @@
 # Template file for 'postgresql-plperl'.
 #
+revision=1
 short_desc="PL/Perl procedural language for PostgreSQL"
 long_desc="${long_desc}
 
@@ -7,9 +8,7 @@ long_desc="${long_desc}
  PostgreSQL 8.4 in Perl. You need this package if you have any PostgreSQL 8.4
  functions that use the languages plperl or plperlu."
 
-Add_dependency run glibc
 Add_dependency run postgresql
-Add_dependency run perl
 
 do_install()
 {
diff --git a/srcpkgs/postgresql/postgresql-plpython.rshlibs b/srcpkgs/postgresql/postgresql-plpython.rshlibs
new file mode 100644
index 0000000000..821019d0aa
--- /dev/null
+++ b/srcpkgs/postgresql/postgresql-plpython.rshlibs
@@ -0,0 +1,6 @@
+libpython2.7.so.1.0
+libpthread.so.0
+libdl.so.2
+libutil.so.1
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/postgresql/postgresql-plpython.template b/srcpkgs/postgresql/postgresql-plpython.template
index eebdb312b4..4a3fea4e5d 100644
--- a/srcpkgs/postgresql/postgresql-plpython.template
+++ b/srcpkgs/postgresql/postgresql-plpython.template
@@ -1,5 +1,6 @@
 # Template file for 'postgresql-plpython'.
 #
+revision=1
 short_desc="PL/Python procedural language for PostgreSQL"
 long_desc="${long_desc}
 
@@ -7,9 +8,7 @@ long_desc="${long_desc}
  PostgreSQL 8.4 in Python. You need this package if you have any PostgreSQL 8.4
  functions that use the languages plpython or plpythonu."
 
-Add_dependency run glibc
 Add_dependency run postgresql
-Add_dependency run python
 
 do_install()
 {
diff --git a/srcpkgs/postgresql/postgresql-pltcl.rshlibs b/srcpkgs/postgresql/postgresql-pltcl.rshlibs
new file mode 100644
index 0000000000..58f30730a2
--- /dev/null
+++ b/srcpkgs/postgresql/postgresql-pltcl.rshlibs
@@ -0,0 +1,5 @@
+libtcl8.5.so
+libdl.so.2
+libpthread.so.0
+libm.so.6
+libc.so.6
diff --git a/srcpkgs/postgresql/postgresql-pltcl.template b/srcpkgs/postgresql/postgresql-pltcl.template
index 51bfd4e83a..39eaf1e83c 100644
--- a/srcpkgs/postgresql/postgresql-pltcl.template
+++ b/srcpkgs/postgresql/postgresql-pltcl.template
@@ -1,5 +1,6 @@
 # Template file for 'postgresql-pltcl'.
 #
+revision=1
 short_desc="PL/Tcl procedural language for PostgreSQL"
 long_desc="${long_desc}
 
@@ -7,9 +8,7 @@ long_desc="${long_desc}
  PostgreSQL 8.4 in Tcl. You need this package if you have any PostgreSQL 8.4
  functions that use the languages pltcl or pltclu."
 
-Add_dependency run glibc
 Add_dependency run postgresql
-Add_dependency run tcl
 
 do_install()
 {
diff --git a/srcpkgs/postgresql/postgresql.rshlibs b/srcpkgs/postgresql/postgresql.rshlibs
new file mode 100644
index 0000000000..ff700cb678
--- /dev/null
+++ b/srcpkgs/postgresql/postgresql.rshlibs
@@ -0,0 +1,8 @@
+libc.so.6
+libxml2.so.2
+libpam.so.0
+libssl.so.1
+libcrypto.so.1
+libdl.so.2
+libm.so.6
+libpq.so.5
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 79216c17aa..0711cffbdc 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -8,6 +8,7 @@ configure_args="--with-docdir=/usr/share/doc --with-openssl --with-python
 --with-perl --with-tcl --without-ldap --without-gssapi --without-krb5
 --without-bonjour --with-libxml --with-libxslt --disable-rpath
 --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-gnu-ld"
+revision=1
 short_desc="Sophisticated open-source Object-Relational DBMS"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.postgresql.org"
@@ -35,11 +36,6 @@ postgres_descr="PostgreSQL database server user"
 # Add the OpenRC service.
 openrc_services="postgresql default false"
 
-Add_dependency run glibc
-Add_dependency run pam
-Add_dependency run libssl
-Add_dependency run libxml2
-Add_dependency run postgresql-libs
 
 Add_dependency build flex
 Add_dependency build gettext
diff --git a/srcpkgs/procps/procps.rshlibs b/srcpkgs/procps/procps.rshlibs
new file mode 100644
index 0000000000..e2dee4ee06
--- /dev/null
+++ b/srcpkgs/procps/procps.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libncursesw.so.6
diff --git a/srcpkgs/procps/template b/srcpkgs/procps/template
index 86faef8257..15f1e29b0a 100644
--- a/srcpkgs/procps/template
+++ b/srcpkgs/procps/template
@@ -1,7 +1,7 @@
 # Template file for 'procps'
 pkgname=procps
 version=3.2.8
-revision=5
+revision=6
 distfiles="http://procps.sf.net/$pkgname-$version.tar.gz"
 patch_args="-Np1"
 build_style=gnu-makefile
@@ -16,6 +16,4 @@ long_desc="
  Version 3 includes NPTL thread support, a rewritten top, many bug fixes,
  performance improvements, and new features."
 
-Add_dependency run glibc
-Add_dependency run ncurses-libs
 Add_dependency build ncurses-devel
diff --git a/srcpkgs/proplib/proplib.rshlibs b/srcpkgs/proplib/proplib.rshlibs
new file mode 100644
index 0000000000..c9f6e3bb61
--- /dev/null
+++ b/srcpkgs/proplib/proplib.rshlibs
@@ -0,0 +1,3 @@
+libz.so.1
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/proplib/template b/srcpkgs/proplib/template
index 17c655ffa1..ab2606987e 100644
--- a/srcpkgs/proplib/template
+++ b/srcpkgs/proplib/template
@@ -3,6 +3,7 @@ pkgname=proplib
 version=0.5.1
 distfiles="http://portableproplib.googlecode.com/files/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
+revision=1
 short_desc="Portable Property container object library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=30ea548500ed5fcad1eb02d6c6157846c219de230676514c0e559ed4c6e401e3
@@ -23,6 +24,4 @@ long_desc="
  been converted to be built through the GNU autotools."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run zlib
 Add_dependency build zlib-devel
diff --git a/srcpkgs/psmisc/psmisc.rshlibs b/srcpkgs/psmisc/psmisc.rshlibs
new file mode 100644
index 0000000000..e2dee4ee06
--- /dev/null
+++ b/srcpkgs/psmisc/psmisc.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libncursesw.so.6
diff --git a/srcpkgs/psmisc/template b/srcpkgs/psmisc/template
index 5226520740..0f9519aec4 100644
--- a/srcpkgs/psmisc/template
+++ b/srcpkgs/psmisc/template
@@ -3,6 +3,7 @@ pkgname=psmisc
 version=22.14
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="Small set of utilities that use the linux proc filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://psmisc.sourceforge.net/index.html"
@@ -13,7 +14,5 @@ long_desc="
  the proc filesystem. We're not about changing the world, but providing
  the system administratror with some help in common tasks."
 
-Add_dependency run glibc
-Add_dependency run ncurses-libs
 Add_dependency build gettext
 Add_dependency build ncurses-devel
diff --git a/srcpkgs/python/python.rshlibs b/srcpkgs/python/python.rshlibs
new file mode 100644
index 0000000000..313b8cd6df
--- /dev/null
+++ b/srcpkgs/python/python.rshlibs
@@ -0,0 +1,19 @@
+libpthread.so.0
+libc.so.6
+libreadline.so.6
+libcrypto.so.1
+libdb-4.8.so
+libsqlite3.so.0
+libncursesw.so.6
+libz.so.1
+libexpat.so.1
+libcrypt.so.1
+libffi.so.5
+libm.so.6
+libpanelw.so.6
+libssl.so.1
+libbz2.so.1
+libnsl.so.1
+libgdbm.so.3
+libdl.so.2
+libutil.so.1
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 094cae63d2..e89dfb2c31 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,7 +1,7 @@
 # Template build file for 'python'.
 pkgname=python
 version=2.7.2
-revision=3
+revision=4
 patch_args="-Np1"
 wrksrc="Python-$version"
 distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.bz2"
@@ -26,17 +26,6 @@ stow_copy=yes
 pycompile_dirs="usr/lib/python2.7"
 subpackages="$pkgname-devel"
 
-Add_dependency run glibc
-Add_dependency run libffi
-Add_dependency run zlib
-Add_dependency run readline
-Add_dependency run bzip2
-Add_dependency run gdbm
-Add_dependency run libssl
-Add_dependency run expat
-Add_dependency run libdb
-Add_dependency run ncurses-libs
-Add_dependency run sqlite
 
 Add_dependency build libffi-devel
 Add_dependency build zlib-devel
diff --git a/srcpkgs/readline/readline.rshlibs b/srcpkgs/readline/readline.rshlibs
new file mode 100644
index 0000000000..3d6081484d
--- /dev/null
+++ b/srcpkgs/readline/readline.rshlibs
@@ -0,0 +1,2 @@
+libncursesw.so.6
+libc.so.6
diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template
index 8fe9c59fb8..1b66a660ac 100644
--- a/srcpkgs/readline/template
+++ b/srcpkgs/readline/template
@@ -4,7 +4,7 @@ _dist_ver=6.2
 _patch_ver=000
 #version=${_dist_ver}.${_patch_ver}
 version=${_dist_ver}
-revision=1
+revision=2
 wrksrc=${pkgname}-${_dist_ver}
 distfiles="http://ftp.gnu.org/gnu/readline/${pkgname}-${_dist_ver}.tar.gz"
 build_style=gnu-configure
@@ -23,8 +23,6 @@ long_desc="
  commands."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run ncurses-libs
 Add_dependency build ncurses-devel
 Add_dependency build texinfo
 
diff --git a/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs b/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs
new file mode 100644
index 0000000000..ba423618de
--- /dev/null
+++ b/srcpkgs/rsyslog/rsyslog-gnutls.rshlibs
@@ -0,0 +1,2 @@
+libgnutls.so.26
+libc.so.6
diff --git a/srcpkgs/rsyslog/rsyslog-gnutls.template b/srcpkgs/rsyslog/rsyslog-gnutls.template
index 4711f9ca71..de0cde94f5 100644
--- a/srcpkgs/rsyslog/rsyslog-gnutls.template
+++ b/srcpkgs/rsyslog/rsyslog-gnutls.template
@@ -1,13 +1,12 @@
 # Template file for 'rsyslog-gnutls'.
 #
+revision=1
 short_desc="${sourcepkg} GnuTLS add-on"
 long_desc="${long_desc}
 
  This package contains the GnuTLS add-on to send encrypted messages."
 
-Add_dependency run glibc
 Add_dependency run rsyslog
-Add_dependency run gnutls
 
 do_install()
 {
diff --git a/srcpkgs/rsyslog/rsyslog-gssapi.rshlibs b/srcpkgs/rsyslog/rsyslog-gssapi.rshlibs
new file mode 100644
index 0000000000..676503107e
--- /dev/null
+++ b/srcpkgs/rsyslog/rsyslog-gssapi.rshlibs
@@ -0,0 +1,2 @@
+libgssapi_krb5.so.2
+libc.so.6
diff --git a/srcpkgs/rsyslog/rsyslog-gssapi.template b/srcpkgs/rsyslog/rsyslog-gssapi.template
index e096bd1a66..c19dfa16d4 100644
--- a/srcpkgs/rsyslog/rsyslog-gssapi.template
+++ b/srcpkgs/rsyslog/rsyslog-gssapi.template
@@ -1,13 +1,12 @@
 # Template file for 'rsyslog-gssapi'.
 #
+revision=1
 short_desc="${sourcepkg} Kerberos5 GSSAPI add-on"
 long_desc="${long_desc}
 
  This package contains the Kerberos5 GSSAPI add-on."
 
-Add_dependency run glibc
 Add_dependency run rsyslog
-Add_dependency run mit-krb5-libs
 
 do_install()
 {
diff --git a/srcpkgs/rsyslog/rsyslog-mysql.rshlibs b/srcpkgs/rsyslog/rsyslog-mysql.rshlibs
new file mode 100644
index 0000000000..483c70869d
--- /dev/null
+++ b/srcpkgs/rsyslog/rsyslog-mysql.rshlibs
@@ -0,0 +1,8 @@
+libmysqlclient.so.16
+libz.so.1
+libcrypt.so.1
+libnsl.so.1
+libm.so.6
+libssl.so.1
+libcrypto.so.1
+libc.so.6
diff --git a/srcpkgs/rsyslog/rsyslog-mysql.template b/srcpkgs/rsyslog/rsyslog-mysql.template
index f4ad0c8788..968203b3b5 100644
--- a/srcpkgs/rsyslog/rsyslog-mysql.template
+++ b/srcpkgs/rsyslog/rsyslog-mysql.template
@@ -1,15 +1,12 @@
 # Template file for 'rsyslog-mysql'.
 #
+revision=1
 short_desc="${sourcepkg} MySQL add-on"
 long_desc="${long_desc}
 
  This package contains the MySQL add-on to store log messages."
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run libssl
 Add_dependency run rsyslog
-Add_dependency run libmysqlclient
 
 do_install()
 {
diff --git a/srcpkgs/rsyslog/rsyslog-postgresql.rshlibs b/srcpkgs/rsyslog/rsyslog-postgresql.rshlibs
new file mode 100644
index 0000000000..09b8829fa8
--- /dev/null
+++ b/srcpkgs/rsyslog/rsyslog-postgresql.rshlibs
@@ -0,0 +1,2 @@
+libpq.so.5
+libc.so.6
diff --git a/srcpkgs/rsyslog/rsyslog-postgresql.template b/srcpkgs/rsyslog/rsyslog-postgresql.template
index 4725bebcdf..3cf4f50a5b 100644
--- a/srcpkgs/rsyslog/rsyslog-postgresql.template
+++ b/srcpkgs/rsyslog/rsyslog-postgresql.template
@@ -1,13 +1,12 @@
 # Template file for 'rsyslog-postgresql'.
 #
+revision=1
 short_desc="${sourcepkg} PostgreSQL add-on"
 long_desc="${long_desc}
 
  This package contains the PostgreSQL add-on to store log messages."
 
-Add_dependency run glibc
 Add_dependency run rsyslog
-Add_dependency run postgresql-libs
 
 do_install()
 {
diff --git a/srcpkgs/rsyslog/rsyslog.rshlibs b/srcpkgs/rsyslog/rsyslog.rshlibs
new file mode 100644
index 0000000000..83fab5d57b
--- /dev/null
+++ b/srcpkgs/rsyslog/rsyslog.rshlibs
@@ -0,0 +1,5 @@
+libpthread.so.0
+libz.so.1
+libdl.so.2
+librt.so.1
+libc.so.6
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index cf65486f94..a31db18b53 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -1,7 +1,7 @@
 # Template file for 'rsyslog'
 pkgname=rsyslog
 version=5.8.5
-revision=9
+revision=10
 homepage="http://www.rsyslog.com"
 distfiles="${homepage}/files/download/rsyslog/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -24,8 +24,6 @@ systemd_services="rsyslog.service on"
 provides="syslog-daemon-0"
 replaces="syslog-daemon>=0"
 
-Add_dependency run glibc
-Add_dependency run zlib
 Add_dependency build pkg-config
 Add_dependency build zlib-devel
 Add_dependency build gnutls-devel
diff --git a/srcpkgs/sed/sed.rshlibs b/srcpkgs/sed/sed.rshlibs
new file mode 100644
index 0000000000..600d48bacf
--- /dev/null
+++ b/srcpkgs/sed/sed.rshlibs
@@ -0,0 +1,2 @@
+libacl.so.1
+libc.so.6
diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template
index ab16028bfc..8014d817a6 100644
--- a/srcpkgs/sed/template
+++ b/srcpkgs/sed/template
@@ -1,7 +1,7 @@
 # Template file for 'sed'
 pkgname=sed
 version=4.2.1
-revision=1
+revision=2
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--bindir=/bin --without-included-regex"
@@ -12,8 +12,6 @@ long_desc="
  Sed, the GNU Stream Editor, copies the named files (standard input default)
  to the standard output, edited according to a script of commands."
 
-Add_dependency run glibc
-Add_dependency run acl
 Add_dependency build acl-devel
 Add_dependency build gettext
 Add_dependency build texinfo
diff --git a/srcpkgs/shadow/shadow.rshlibs b/srcpkgs/shadow/shadow.rshlibs
new file mode 100644
index 0000000000..a9b1eb8d2c
--- /dev/null
+++ b/srcpkgs/shadow/shadow.rshlibs
@@ -0,0 +1,4 @@
+libc.so.6
+libpam.so.0
+libpam_misc.so.0
+libcrypt.so.1
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index 4884dcb2cf..a382ae8597 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.1.4.3
-revision=2
+revision=3
 distfiles="http://pkg-shadow.alioth.debian.org/releases/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--libdir=/lib --enable-shared --disable-static
@@ -19,8 +19,6 @@ conf_files="/etc/pam.d/usermod /etc/pam.d/userdel /etc/pam.d/useradd
  /etc/pam.d/chgpasswd /etc/pam.d/chfn /etc/pam.d/chage /etc/defaults/useradd
  /etc/pam.d/other /etc/login.defs"
 
-Add_dependency run glibc
-Add_dependency run pam		">=1.1.1_3"
 Add_dependency build pam-devel
 Add_dependency build gettext
 
diff --git a/srcpkgs/sqlite/sqlite-tcl.rshlibs b/srcpkgs/sqlite/sqlite-tcl.rshlibs
new file mode 100644
index 0000000000..5c5d2ae913
--- /dev/null
+++ b/srcpkgs/sqlite/sqlite-tcl.rshlibs
@@ -0,0 +1,2 @@
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/sqlite/sqlite-tcl.template b/srcpkgs/sqlite/sqlite-tcl.template
index e43c2d5a69..aa6080152a 100644
--- a/srcpkgs/sqlite/sqlite-tcl.template
+++ b/srcpkgs/sqlite/sqlite-tcl.template
@@ -1,11 +1,11 @@
 # Template file for 'sqlite-tcl'.
 #
+revision=1
 short_desc="${sourcepkg} TCL bindings"
 long_desc="${long_desc}
 
  This package contains TCL bindings for sqlite."
 
-Add_dependency run glibc
 Add_dependency run sqlite
 Add_dependency run tcl
 
diff --git a/srcpkgs/sqlite/sqlite.rshlibs b/srcpkgs/sqlite/sqlite.rshlibs
new file mode 100644
index 0000000000..3868690cf7
--- /dev/null
+++ b/srcpkgs/sqlite/sqlite.rshlibs
@@ -0,0 +1,4 @@
+libreadline.so.6
+libc.so.6
+libdl.so.2
+libpthread.so.0
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 97ab699d87..ddbef19132 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -5,6 +5,7 @@ _amalgamationver=3070900
 wrksrc=sqlite
 create_wrksrc=yes
 distfiles="http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz"
+revision=1
 short_desc="SQL Database Engine in a C Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.sqlite.org"
@@ -23,8 +24,6 @@ long_desc="
  from the database files on disk."
 
 subpackages="$pkgname-devel $pkgname-tcl"
-Add_dependency run glibc
-Add_dependency run readline
 Add_dependency build readline-devel
 Add_dependency build tcl-devel
 
diff --git a/srcpkgs/sudo/sudo.rshlibs b/srcpkgs/sudo/sudo.rshlibs
new file mode 100644
index 0000000000..22a414a554
--- /dev/null
+++ b/srcpkgs/sudo/sudo.rshlibs
@@ -0,0 +1,5 @@
+libc.so.6
+libutil.so.1
+libdl.so.2
+libz.so.1
+libpam.so.0
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index efded1cd84..fa522c268c 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -6,6 +6,7 @@ build_style=gnu-configure
 configure_args="--with-ignore-dot -with-all-insults --with-env-editor
 --enable-shell-sets-home --enable-noargs-shell --without-sendmail
 --disable-root-sudo --with-logfac=auth --disable-root-mailer"
+revision=1
 short_desc="Allow others to run commands as root"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gratisoft.us/sudo/"
@@ -20,9 +21,6 @@ long_desc="
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 nostrip=yes
 
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run pam
 Add_dependency build gettext
 Add_dependency build zlib-devel
 Add_dependency build pam-devel
diff --git a/srcpkgs/sysfsutils/libsysfs.rshlibs b/srcpkgs/sysfsutils/libsysfs.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/sysfsutils/libsysfs.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/sysfsutils/libsysfs.template b/srcpkgs/sysfsutils/libsysfs.template
index ce60e977e7..090b1f8475 100644
--- a/srcpkgs/sysfsutils/libsysfs.template
+++ b/srcpkgs/sysfsutils/libsysfs.template
@@ -6,9 +6,8 @@ long_desc="${long_desc}
  The library's purpose is to provide a consistant and stable interface for
  querying system device information exposed through sysfs."
 
-revision=1
+revision=2
 
-Add_dependency run glibc
 
 do_install()
 {
diff --git a/srcpkgs/sysfsutils/sysfsutils.rshlibs b/srcpkgs/sysfsutils/sysfsutils.rshlibs
new file mode 100644
index 0000000000..f47138265d
--- /dev/null
+++ b/srcpkgs/sysfsutils/sysfsutils.rshlibs
@@ -0,0 +1,2 @@
+libsysfs.so.2
+libc.so.6
diff --git a/srcpkgs/sysfsutils/template b/srcpkgs/sysfsutils/template
index 66becabe3e..44c4450bfa 100644
--- a/srcpkgs/sysfsutils/template
+++ b/srcpkgs/sysfsutils/template
@@ -3,6 +3,7 @@ pkgname=sysfsutils
 version=2.1.0
 distfiles="${SOURCEFORGE_SITE}/linux-diag/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="System Utilities Based on Sysfs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a
@@ -11,5 +12,3 @@ long_desc="
  in Linux kernel versions 2.5+ that exposes a system's device tree."
 
 subpackages="libsysfs libsysfs-devel"
-Add_dependency run glibc
-Add_dependency run libsysfs
diff --git a/srcpkgs/systemd/systemd-admin.rshlibs b/srcpkgs/systemd/systemd-admin.rshlibs
new file mode 100644
index 0000000000..85ead6d836
--- /dev/null
+++ b/srcpkgs/systemd/systemd-admin.rshlibs
@@ -0,0 +1,6 @@
+libgtk-x11-2.0.so.0
+libgio-2.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/systemd/systemd-admin.template b/srcpkgs/systemd/systemd-admin.template
index 716131731f..a8e441bb43 100644
--- a/srcpkgs/systemd/systemd-admin.template
+++ b/srcpkgs/systemd/systemd-admin.template
@@ -1,13 +1,11 @@
 # Template file for 'systemd-admin'.
 #
+revision=1
 short_desc="${sourcepkg} - system administration GUI"
 long_desc="${long_desc}
 
  This package contains systemadm, a GTK+2 application to administer systemd."
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run gtk+
 Add_dependency run systemd
 
 do_install()
diff --git a/srcpkgs/systemd/systemd-gnome-passwd-agent.rshlibs b/srcpkgs/systemd/systemd-gnome-passwd-agent.rshlibs
new file mode 100644
index 0000000000..d1e96a7d2e
--- /dev/null
+++ b/srcpkgs/systemd/systemd-gnome-passwd-agent.rshlibs
@@ -0,0 +1,8 @@
+libnotify.so.4
+libgtk-x11-2.0.so.0
+libgio-2.0.so.0
+libgobject-2.0.so.0
+libglib-2.0.so.0
+librt.so.1
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/systemd/systemd-gnome-passwd-agent.template b/srcpkgs/systemd/systemd-gnome-passwd-agent.template
index a5cccd4f28..04b87348b2 100644
--- a/srcpkgs/systemd/systemd-gnome-passwd-agent.template
+++ b/srcpkgs/systemd/systemd-gnome-passwd-agent.template
@@ -1,15 +1,12 @@
 # Template file for 'systemd-gnome-passwd-aggent'.
 #
+revision=1
 short_desc="${sourcepkg} - GNOME password agent helper"
 long_desc="${long_desc}
 
  This package contains systemd-gnome-ask-password-agent, a GNOME
  helper to assist in password changes with systemd."
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run gtk+
-Add_dependency run libnotify
 Add_dependency run systemd
 
 do_install()
diff --git a/srcpkgs/systemd/systemd.rshlibs b/srcpkgs/systemd/systemd.rshlibs
new file mode 100644
index 0000000000..7cf80775f1
--- /dev/null
+++ b/srcpkgs/systemd/systemd.rshlibs
@@ -0,0 +1,11 @@
+libcap.so.2
+librt.so.1
+libc.so.6
+ld-linux.so.2
+libdl.so.2
+libdbus-1.so.3
+libpthread.so.0
+libudev.so.0
+libpam.so.0
+libacl.so.1
+libpam_misc.so.0
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index 45385501c3..5e2c5bc4e5 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -1,7 +1,7 @@
 # Template file for 'systemd'
 pkgname=systemd
 version=37
-revision=6
+revision=7
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--with-distro=other --with-rootdir=
@@ -32,13 +32,7 @@ conf_files="
 /etc/systemd/user.conf
 /etc/systemd/systemd-logind.conf"
 
-Add_dependency run glibc
-Add_dependency run libudev
-Add_dependency run pam
-Add_dependency run libcap
-Add_dependency run dbus-libs
 Add_dependency run dbus
-Add_dependency run acl
 
 Add_dependency build pkg-config
 Add_dependency build intltool
diff --git a/srcpkgs/talloc/talloc.rshlibs b/srcpkgs/talloc/talloc.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/talloc/talloc.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template
index cddecb98aa..d8b9844df5 100644
--- a/srcpkgs/talloc/template
+++ b/srcpkgs/talloc/template
@@ -4,6 +4,7 @@ version=2.0.1
 distfiles="http://samba.org/ftp/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-talloc-compat1 --enable-largefile"
+revision=1
 short_desc="Hierarchical pool based memory allocator with destructors"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4
@@ -12,7 +13,6 @@ long_desc="
  allocator with destructors."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
 Add_dependency build pkg-config
 Add_dependency build libxslt
 
diff --git a/srcpkgs/tcl/tcl.rshlibs b/srcpkgs/tcl/tcl.rshlibs
new file mode 100644
index 0000000000..c15ad2eb5d
--- /dev/null
+++ b/srcpkgs/tcl/tcl.rshlibs
@@ -0,0 +1,4 @@
+libc.so.6
+libdl.so.2
+libpthread.so.0
+libm.so.6
diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index d71a7ec610..f2fcf21230 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -3,6 +3,7 @@ pkgname=tcl
 version=8.5.10
 wrksrc="tcl${version}/unix"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}${version}-src.tar.gz"
+revision=1
 short_desc="The TCL scripting language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="www.tcl.tk"
@@ -15,7 +16,6 @@ long_desc="
 
 subpackages="tcl-devel"
 
-Add_dependency run glibc
 
 do_build()
 {
diff --git a/srcpkgs/tcp_wrappers/tcp_wrappers-libs.rshlibs b/srcpkgs/tcp_wrappers/tcp_wrappers-libs.rshlibs
new file mode 100644
index 0000000000..7869368324
--- /dev/null
+++ b/srcpkgs/tcp_wrappers/tcp_wrappers-libs.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libnsl.so.1
diff --git a/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template b/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
index b89eb664b9..4273a71eaf 100644
--- a/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
+++ b/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
@@ -5,10 +5,9 @@ long_desc="${long_desc}
 
  This package contains the ${pkgname} shared libraries."
 
-revision=1
+revision=2
 conf_files="/etc/hosts.allow /etc/hosts.deny"
 
-Add_dependency run glibc
 
 do_install()
 {
diff --git a/srcpkgs/tcp_wrappers/tcp_wrappers.rshlibs b/srcpkgs/tcp_wrappers/tcp_wrappers.rshlibs
new file mode 100644
index 0000000000..04a51622e3
--- /dev/null
+++ b/srcpkgs/tcp_wrappers/tcp_wrappers.rshlibs
@@ -0,0 +1,2 @@
+libwrap.so.0
+libc.so.6
diff --git a/srcpkgs/tcp_wrappers/template b/srcpkgs/tcp_wrappers/template
index ca19950c45..9682f6c02d 100644
--- a/srcpkgs/tcp_wrappers/template
+++ b/srcpkgs/tcp_wrappers/template
@@ -5,6 +5,7 @@ wrksrc="${pkgname}_${version}"
 distfiles="ftp://ftp.porcupine.org/pub/security/${pkgname}_${version}.tar.gz"
 build_style=gnu-makefile
 make_build_target="REAL_DAEMON_DIR=/usr/sbin STYLE=-DSYS_ERRLIST_DEFINED linux"
+revision=1
 short_desc="A security tool which acts as a wrapper for TCP daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d
@@ -14,8 +15,6 @@ long_desc="
  rlogin, rsh, exec, tftp, talk and other network services."
 
 subpackages="$pkgname-devel $pkgname-libs"
-Add_dependency run glibc
-Add_dependency run tcp_wrappers-libs
 
 pre_install()
 {
diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template
index a60fd18202..c68cb12c9e 100644
--- a/srcpkgs/texinfo/template
+++ b/srcpkgs/texinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'texinfo'
 pkgname=texinfo
 version=4.13a
-revision=5
+revision=6
 wrksrc="$pkgname-4.13"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -14,8 +14,6 @@ long_desc="
  on Brian Reid's Scribe and other formatting languages of the time. It is
  used by many non-GNU projects as well."
 
-Add_dependency run glibc
-Add_dependency run ncurses-libs
 Add_dependency run findutils
 Add_dependency run gzip
 Add_dependency run coreutils
diff --git a/srcpkgs/texinfo/texinfo.rshlibs b/srcpkgs/texinfo/texinfo.rshlibs
new file mode 100644
index 0000000000..e2dee4ee06
--- /dev/null
+++ b/srcpkgs/texinfo/texinfo.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libncursesw.so.6
diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template
index 7a6c0a862c..d5f1a59e35 100644
--- a/srcpkgs/tiff/template
+++ b/srcpkgs/tiff/template
@@ -4,6 +4,7 @@ version=3.9.3
 distfiles="ftp://ftp.remotesensing.org/pub/libtiff/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-cxx --without-x"
+revision=1
 short_desc="Library and tools for reading and writing TIFF data files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=60e08794966b7cbf46bbf13c347f1fe41c982f98714909f49d6f198add4fdee6
@@ -20,10 +21,5 @@ long_desc="
  esoteric portions of the 6.0 TIFF spec."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency run libgcc
-Add_dependency run libstdc++
-Add_dependency run zlib
-Add_dependency run jpeg
 Add_dependency build zlib-devel
 Add_dependency build jpeg-devel
diff --git a/srcpkgs/tiff/tiff.rshlibs b/srcpkgs/tiff/tiff.rshlibs
new file mode 100644
index 0000000000..d322904685
--- /dev/null
+++ b/srcpkgs/tiff/tiff.rshlibs
@@ -0,0 +1,6 @@
+libm.so.6
+libc.so.6
+libjpeg.so.8
+libz.so.1
+libstdc++.so.6
+libgcc_s.so.1
diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 8686b62021..7f68957cc8 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -10,6 +10,7 @@ ftp://munnari.oz.au/pub/tzcode${_tzcode_ver}.tar.gz
 ftp://munnari.oz.au/pub/tzdata${_tzdata_ver}.tar.gz"
 build_style=gnu-makefile
 homepage="http://www.twinsun.com/tz/tz-link.htm"
+revision=1
 short_desc="Time zone and daylight-saving time data"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
diff --git a/srcpkgs/tzdata/tzdata.rshlibs b/srcpkgs/tzdata/tzdata.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/tzdata/tzdata.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/udev/libudev.rshlibs b/srcpkgs/udev/libudev.rshlibs
new file mode 100644
index 0000000000..f7df7fcad1
--- /dev/null
+++ b/srcpkgs/udev/libudev.rshlibs
@@ -0,0 +1,2 @@
+librt.so.1
+libc.so.6
diff --git a/srcpkgs/udev/libudev.template b/srcpkgs/udev/libudev.template
index 605941bf9d..03bef16889 100644
--- a/srcpkgs/udev/libudev.template
+++ b/srcpkgs/udev/libudev.template
@@ -1,11 +1,11 @@
 # Template file for 'libudev'.
 #
+revision=1
 short_desc="libudev shared library"
 long_desc="${long_desc}
 
  This library provides access to udev device information."
 
-Add_dependency run glibc
 
 do_install()
 {
diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template
index 061ae3bf51..b691edd0eb 100644
--- a/srcpkgs/udev/template
+++ b/srcpkgs/udev/template
@@ -1,7 +1,7 @@
 # Template file for 'udev'
 pkgname=udev
 version=175
-revision=1
+revision=2
 #distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2"
 distfiles="http://people.freedesktop.org/~kay/udev/udev-${version}.tar.bz2"
 build_style=gnu-configure
@@ -22,9 +22,6 @@ systemd_services="udev.service on"
 conf_files="/etc/udev/udev.conf"
 subpackages="libudev libudev-devel"
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run acl
 
 Add_dependency build pkg-config
 Add_dependency build gperf
diff --git a/srcpkgs/udev/udev.rshlibs b/srcpkgs/udev/udev.rshlibs
new file mode 100644
index 0000000000..1a9a36618a
--- /dev/null
+++ b/srcpkgs/udev/udev.rshlibs
@@ -0,0 +1,6 @@
+librt.so.1
+libc.so.6
+libm.so.6
+libacl.so.1
+libglib-2.0.so.0
+libpthread.so.0
diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template
index fc28090cf8..556a5edfd8 100644
--- a/srcpkgs/usbutils/template
+++ b/srcpkgs/usbutils/template
@@ -2,6 +2,7 @@
 pkgname=usbutils
 version=002
 distfiles="${KERNEL_SITE}/utils/usb/$pkgname/$pkgname-$version.tar.bz2"
+revision=1
 short_desc="Linux USB utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=75da0785a8402d1c52a65ad8ed95decd96dc7294651f43f11b07c15cdfdce1f8
@@ -9,9 +10,6 @@ long_desc="
  This package contains utilities for inspecting devices connected to a
  USB bus."
 
-Add_dependency run glibc
-Add_dependency run libusb
-Add_dependency run libusb-compat
 Add_dependency build pkg-config
 Add_dependency build which
 Add_dependency build libusb-devel
diff --git a/srcpkgs/usbutils/usbutils.rshlibs b/srcpkgs/usbutils/usbutils.rshlibs
new file mode 100644
index 0000000000..d80bdd6350
--- /dev/null
+++ b/srcpkgs/usbutils/usbutils.rshlibs
@@ -0,0 +1,2 @@
+libusb-1.0.so.0
+libc.so.6
diff --git a/srcpkgs/util-linux/libblkid.rshlibs b/srcpkgs/util-linux/libblkid.rshlibs
new file mode 100644
index 0000000000..d0dcd0e300
--- /dev/null
+++ b/srcpkgs/util-linux/libblkid.rshlibs
@@ -0,0 +1,2 @@
+libuuid.so.1
+libc.so.6
diff --git a/srcpkgs/util-linux/libblkid.template b/srcpkgs/util-linux/libblkid.template
index 834f563769..6bea75d60e 100644
--- a/srcpkgs/util-linux/libblkid.template
+++ b/srcpkgs/util-linux/libblkid.template
@@ -1,13 +1,12 @@
 # Template file for 'libblkid'.
 #
+revision=1
 short_desc="Library to handle device identification"
 long_desc="
  The libblkid package contains a library to handle device identification
  and token extraction."
 
-Add_dependency run glibc
 Add_dependency run zlib
-Add_dependency run libuuid
 
 do_install()
 {
diff --git a/srcpkgs/util-linux/libmount.rshlibs b/srcpkgs/util-linux/libmount.rshlibs
new file mode 100644
index 0000000000..058f802fe0
--- /dev/null
+++ b/srcpkgs/util-linux/libmount.rshlibs
@@ -0,0 +1,3 @@
+libblkid.so.1
+libuuid.so.1
+libc.so.6
diff --git a/srcpkgs/util-linux/libmount.template b/srcpkgs/util-linux/libmount.template
index a463813b6e..d8e3e274cd 100644
--- a/srcpkgs/util-linux/libmount.template
+++ b/srcpkgs/util-linux/libmount.template
@@ -1,14 +1,12 @@
 # Template file for 'libmount'.
 #
+revision=1
 short_desc="A mount(8) library"
 long_desc="
  This NEW LIBRARY is designed to be used in low-level utils like
  mount(8) and /sbin/mount.&lt;type&gt; helpers as well as in some other
  projects."
 
-Add_dependency run glibc
-Add_dependency run libblkid
-Add_dependency run libuuid
 
 do_install()
 {
diff --git a/srcpkgs/util-linux/libuuid.rshlibs b/srcpkgs/util-linux/libuuid.rshlibs
new file mode 100644
index 0000000000..a417cabd5b
--- /dev/null
+++ b/srcpkgs/util-linux/libuuid.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+ld-linux.so.2
diff --git a/srcpkgs/util-linux/libuuid.template b/srcpkgs/util-linux/libuuid.template
index 55ac6ad9c0..05ea26b44e 100644
--- a/srcpkgs/util-linux/libuuid.template
+++ b/srcpkgs/util-linux/libuuid.template
@@ -1,11 +1,11 @@
 # Template file for 'libuuid'.
 #
+revision=1
 short_desc="UUID library"
 long_desc="
  libuuid generates and parses 128-bit universally unique id's (UUIDs).
  See RFC 4122 for more information."
 
-Add_dependency run glibc
 
 do_install()
 {
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 524dc4eeb9..7d9d7d0fe9 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -3,7 +3,7 @@ pkgname=util-linux
 _distver=2.20
 _patchver=".1"
 version=${_distver}${_patchver}
-revision=1
+revision=2
 wrksrc=${pkgname}-${version}
 #distfiles="${KERNEL_SITE}/utils/${pkgname}/v${_distver}/${pkgname}-${version}.tar.bz2"
 distfiles="ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${version}.tar.bz2"
@@ -21,13 +21,7 @@ replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1"
 subpackages="libmount libmount-devel libblkid libblkid-devel libuuid libuuid-devel"
 make_dirs="/var/lib/hwclock 0755 0 0"
 
-Add_dependency run glibc
-Add_dependency run zlib
 Add_dependency run coreutils
-Add_dependency run libuuid
-Add_dependency run libblkid
-Add_dependency run libmount
-Add_dependency run ncurses-libs
 Add_dependency run shadow
 
 Add_dependency build pkg-config
diff --git a/srcpkgs/util-linux/util-linux.rshlibs b/srcpkgs/util-linux/util-linux.rshlibs
new file mode 100644
index 0000000000..622836bee9
--- /dev/null
+++ b/srcpkgs/util-linux/util-linux.rshlibs
@@ -0,0 +1,7 @@
+libblkid.so.1
+libc.so.6
+libz.so.1
+libuuid.so.1
+libncursesw.so.6
+libutil.so.1
+libmount.so.1
diff --git a/srcpkgs/vala/libvala.rshlibs b/srcpkgs/vala/libvala.rshlibs
new file mode 100644
index 0000000000..9ba5b3529a
--- /dev/null
+++ b/srcpkgs/vala/libvala.rshlibs
@@ -0,0 +1,6 @@
+libgobject-2.0.so.0
+libgthread-2.0.so.0
+librt.so.1
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
diff --git a/srcpkgs/vala/libvala.template b/srcpkgs/vala/libvala.template
index 635119cd35..c241df845e 100644
--- a/srcpkgs/vala/libvala.template
+++ b/srcpkgs/vala/libvala.template
@@ -1,12 +1,11 @@
 # Template file for 'libvala'.
 #
+revision=1
 short_desc="${short_desc} - shared library"
 long_desc="${long_desc}
 
  This package contains the shared library."
 
-Add_dependency run glibc
-Add_dependency run glib
 
 do_install()
 {
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 1daac8b1b0..f019552bc8 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -4,6 +4,7 @@ version=0.14.0
 distfiles="${GNOME_SITE}/vala/0.14/vala-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--enable-vapigen"
+revision=1
 short_desc="Compiler for the GObject type system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://live.gnome.org/Vala"
@@ -17,9 +18,6 @@ long_desc="
 
 subpackages="libvala vala-devel"
 
-Add_dependency run glibc
-Add_dependency run glib
-Add_dependency run libvala
 
 Add_dependency build pkg-config
 Add_dependency build flex
diff --git a/srcpkgs/vala/vala.rshlibs b/srcpkgs/vala/vala.rshlibs
new file mode 100644
index 0000000000..c443b88b8e
--- /dev/null
+++ b/srcpkgs/vala/vala.rshlibs
@@ -0,0 +1,7 @@
+libvala-0.14.so.0
+libgobject-2.0.so.0
+libgmodule-2.0.so.0
+libglib-2.0.so.0
+libpthread.so.0
+libc.so.6
+libgthread-2.0.so.0
diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 1713475764..2fb2e96087 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -8,6 +8,7 @@ configure_args="--disable-perlinterp --disable-pythoninterp --disable-rubyinterp
 --disable-cscope --disable-workshop --disable-netbeans --disable-sniff
 --disable-gpm --disable-hangulinput --disable-xim --enable-gui=no
 --without-x --enable-multibyte --with-tlib=ncursesw"
+revision=1
 short_desc="Vim editor (vi clone)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -19,9 +20,6 @@ nofetch=yes
 noextract=yes
 subpackages="vim-common"
 
-Add_dependency run glibc
-Add_dependency run ncurses-libs
-Add_dependency run acl
 Add_dependency run vim-common		">=${version}"
 Add_dependency build mercurial
 Add_dependency build ncurses-devel
diff --git a/srcpkgs/vim/vim.rshlibs b/srcpkgs/vim/vim.rshlibs
new file mode 100644
index 0000000000..0c3d4a2e4d
--- /dev/null
+++ b/srcpkgs/vim/vim.rshlibs
@@ -0,0 +1,5 @@
+libm.so.6
+libncursesw.so.6
+libacl.so.1
+libdl.so.2
+libc.so.6
diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index eec2b91d74..593279cdfd 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -5,6 +5,7 @@ distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-ssl=openssl
 POD2MAN=/usr/lib/perl5/core_perl/bin/pod2man"
+revision=1
 short_desc="The GNU wget utility"
 maintainer="Juan RP <xtraeme@gmail.org>"
 homepage="http://www.gnu.org/software/wget/wget.html"
@@ -33,9 +34,6 @@ long_desc="
     * GNU Wget is distributed under the GNU General Public License."
 
 conf_files="/etc/wgetrc"
-Add_dependency run glibc
-Add_dependency run libssl
-Add_dependency run libidn
 Add_dependency run ca-certificates
 Add_dependency build perl	">=0"
 Add_dependency build gettext
diff --git a/srcpkgs/wget/wget.rshlibs b/srcpkgs/wget/wget.rshlibs
new file mode 100644
index 0000000000..13ca4cab52
--- /dev/null
+++ b/srcpkgs/wget/wget.rshlibs
@@ -0,0 +1,5 @@
+libssl.so.1
+libcrypto.so.1
+libidn.so.11
+librt.so.1
+libc.so.6
diff --git a/srcpkgs/which/template b/srcpkgs/which/template
index d3f54ee110..f9c33323a2 100644
--- a/srcpkgs/which/template
+++ b/srcpkgs/which/template
@@ -3,6 +3,7 @@ pkgname=which
 version=2.20
 distfiles="http://www.xs4all.nl/~carlo17/which/which-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="Displays where a particular program in your path is located"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8
diff --git a/srcpkgs/which/which.rshlibs b/srcpkgs/which/which.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/which/which.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/wireless_tools/template b/srcpkgs/wireless_tools/template
index 964867eb6a..5c3cca8dcb 100644
--- a/srcpkgs/wireless_tools/template
+++ b/srcpkgs/wireless_tools/template
@@ -1,7 +1,7 @@
 # Template file for 'wireless_tools'
 pkgname=wireless_tools
 version=29
-revision=2
+revision=3
 wrksrc="${pkgname}.${version}"
 distfiles="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$pkgname.$version.tar.gz"
 build_style=gnu-makefile
@@ -20,4 +20,3 @@ long_desc="
  reference implementation."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
diff --git a/srcpkgs/wireless_tools/wireless_tools.rshlibs b/srcpkgs/wireless_tools/wireless_tools.rshlibs
new file mode 100644
index 0000000000..0b7acb5514
--- /dev/null
+++ b/srcpkgs/wireless_tools/wireless_tools.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libm.so.6
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index d0e8b106c4..ae0666333f 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=0.7.3
-revision=4
+revision=5
 wrksrc=${pkgname}-${version}/${pkgname}
 distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
@@ -23,11 +23,6 @@ long_desc="
 conf_files="/etc/${pkgname}.conf"
 systemd_services="${pkgname}.service on"
 
-Add_dependency run glibc
-Add_dependency run libnl
-Add_dependency run libssl
-Add_dependency run dbus-libs
-Add_dependency run readline
 
 Add_dependency build libnl-devel
 Add_dependency build openssl-devel
diff --git a/srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs b/srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs
new file mode 100644
index 0000000000..18b14a3c13
--- /dev/null
+++ b/srcpkgs/wpa_supplicant/wpa_supplicant.rshlibs
@@ -0,0 +1,7 @@
+libreadline.so.6
+libc.so.6
+libcrypto.so.1
+libnl.so.1
+libssl.so.1
+libdbus-1.so.3
+libpthread.so.0
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 0720b384c0..657102cb15 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -5,6 +5,7 @@ distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
 build_style=configure
 configure_args="--prefix=/ --includedir=/usr/include 
 --datadir=/usr/share --mandir=/usr/share/man --with-pie"
+revision=1
 short_desc="The XBPS package system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -20,12 +21,6 @@ subpackages="$pkgname-static"
 replaces="xbps>=0"
 
 Add_dependency run xbps-triggers
-Add_dependency run glibc
-Add_dependency run zlib
-Add_dependency run proplib
-Add_dependency run libarchive
-Add_dependency run libssl
-Add_dependency run libfetch
 
 Add_dependency build pkg-config
 Add_dependency build zlib-devel
diff --git a/srcpkgs/xbps/xbps.rshlibs b/srcpkgs/xbps/xbps.rshlibs
new file mode 100644
index 0000000000..a4cf6180cd
--- /dev/null
+++ b/srcpkgs/xbps/xbps.rshlibs
@@ -0,0 +1,7 @@
+libpthread.so.0
+libprop.so.0
+libc.so.6
+libfetch.so
+libz.so.1
+libarchive.so.2
+libcrypto.so.1
diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template
index 713c235aed..1a174cb7fb 100644
--- a/srcpkgs/xfsprogs/template
+++ b/srcpkgs/xfsprogs/template
@@ -3,6 +3,7 @@ pkgname=xfsprogs
 version=3.1.5
 #distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$version.tar.gz"
 distfiles="http://ftp.gwdg.de/pub/linux/misc/xfs/xfs/previous/$pkgname-$version.tar.gz"
+revision=1
 short_desc="Utilities for managing the XFS filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=13347de43203c4575bca7a72efb344c7caf8a86fa216bbd69bf1980f2fb2f37f
@@ -18,11 +19,6 @@ long_desc="
 disable_parallel_build=yes
 subpackages="$pkgname-libs $pkgname-devel"
 
-Add_dependency run glibc
-Add_dependency run libuuid
-Add_dependency run libblkid
-Add_dependency run readline
-Add_dependency run xfsprogs-libs
 
 Add_dependency build gawk
 Add_dependency build gettext
diff --git a/srcpkgs/xfsprogs/xfsprogs-libs.rshlibs b/srcpkgs/xfsprogs/xfsprogs-libs.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/xfsprogs/xfsprogs-libs.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/xfsprogs/xfsprogs-libs.template b/srcpkgs/xfsprogs/xfsprogs-libs.template
index 13c225de23..31e6eed5bf 100644
--- a/srcpkgs/xfsprogs/xfsprogs-libs.template
+++ b/srcpkgs/xfsprogs/xfsprogs-libs.template
@@ -1,11 +1,11 @@
 # Template file for 'xfsprogs-libs'.
 #
+revision=1
 short_desc="${short_desc} (shared libraries)"
 long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-Add_dependency run glibc
 
 do_install()
 {
diff --git a/srcpkgs/xfsprogs/xfsprogs.rshlibs b/srcpkgs/xfsprogs/xfsprogs.rshlibs
new file mode 100644
index 0000000000..79f7c3403d
--- /dev/null
+++ b/srcpkgs/xfsprogs/xfsprogs.rshlibs
@@ -0,0 +1,7 @@
+libuuid.so.1
+librt.so.1
+libpthread.so.0
+libc.so.6
+libblkid.so.1
+libreadline.so.6
+libhandle.so.1
diff --git a/srcpkgs/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template
index 04808e32b3..bb5835a9eb 100644
--- a/srcpkgs/xmlcatmgr/template
+++ b/srcpkgs/xmlcatmgr/template
@@ -3,6 +3,7 @@ pkgname=xmlcatmgr
 version=2.2
 distfiles="$SOURCEFORGE_SITE/xmlcatmgr/$pkgname-$version.tar.gz"
 build_style=gnu-configure
+revision=1
 short_desc="XML and SGML catalog manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ea1142b6aef40fbd624fc3e2130cf10cf081b5fa88e5229c92b8f515779d6fdc
diff --git a/srcpkgs/xmlcatmgr/xmlcatmgr.rshlibs b/srcpkgs/xmlcatmgr/xmlcatmgr.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/xmlcatmgr/xmlcatmgr.rshlibs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/srcpkgs/xmlto/template b/srcpkgs/xmlto/template
index b20093871d..6e591b4cec 100644
--- a/srcpkgs/xmlto/template
+++ b/srcpkgs/xmlto/template
@@ -1,7 +1,7 @@
 # Template file for 'xmlto'
 pkgname=xmlto
 version=0.0.23
-revision=1
+revision=2
 #distfiles="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$version.tar.bz2"
 distfiles="http://xbps.nopcode.org/distfiles/xmlto-$version.tar.bz2"
 build_style=gnu-configure
diff --git a/srcpkgs/xmlto/xmlto.rshlibs b/srcpkgs/xmlto/xmlto.rshlibs
new file mode 100644
index 0000000000..631aa1dda4
--- /dev/null
+++ b/srcpkgs/xmlto/xmlto.rshlibs
@@ -0,0 +1 @@
+libc.so.6