diff --git a/srcpkgs/pam-userdb b/srcpkgs/pam-userdb
new file mode 120000
index 0000000000..4b9cd459f8
--- /dev/null
+++ b/srcpkgs/pam-userdb
@@ -0,0 +1 @@
+pam
\ No newline at end of file
diff --git a/srcpkgs/pam/pam-userdb.template b/srcpkgs/pam/pam-userdb.template
new file mode 100644
index 0000000000..d5a67cab13
--- /dev/null
+++ b/srcpkgs/pam/pam-userdb.template
@@ -0,0 +1,23 @@
+# Template file for 'pam-userdb'.
+#
+short_desc="PAM module to authenticate against a db database"
+long_desc="${long_desc}
+
+ The pam_userdb module is used to verify a username/password pair against
+ values stored in a Berkeley DB database. The database is indexed by the
+ username, and the data fields corresponding to the username keys are the
+ passwords."
+
+Add_dependency run db
+Add_dependency run pam
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/lib/security
+	mkdir -p ${DESTDIR}/usr/share/man/man8
+
+	mv ${SRCPKGDESTDIR}/lib/security/pam_userdb.so \
+		${DESTDIR}/lib/security
+	mv ${SRCPKGDESTDIR}/usr/share/man/man8/pam_userdb.8 \
+		${DESTDIR}/usr/share/man/man8
+}
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index c3ca541209..963cbe5492 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,7 +1,7 @@
 # Template file for 'pam'
 pkgname=pam
 version=1.1.1
-revision=1
+revision=2
 wrksrc="Linux-PAM-$version"
 distfiles="${KERNEL_SITE}/libs/pam/library/Linux-PAM-$version.tar.bz2"
 build_style=gnu_configure
@@ -15,14 +15,17 @@ long_desc="
  Linux-PAM provides a flexible mechanism for authenticating users.
  PAM was invented by SUN Microsystems."
 
-conf_files="/etc/security/access.conf /etc/security/environment
- /etc/security/group.conf /etc/security/limits.conf
- /etc/security/namespace.conf /etc/security/pam_env.conf
- /etc/security/time.conf"
-subpackages="pam-devel"
+conf_files="
+/etc/security/access.conf
+/etc/security/environment
+/etc/security/group.conf
+/etc/security/limits.conf
+/etc/security/namespace.conf
+/etc/security/pam_env.conf
+/etc/security/time.conf"
+subpackages="pam-devel pam-userdb"
 
 Add_dependency run glibc
-Add_dependency run db
 Add_dependency run cracklib
 Add_dependency build flex
 Add_dependency build gettext