diff --git a/srcpkgs/pam/pam-devel.template b/srcpkgs/pam/pam-devel.template
index 0c0b48a11e1..13409d03b2f 100644
--- a/srcpkgs/pam/pam-devel.template
+++ b/srcpkgs/pam/pam-devel.template
@@ -2,10 +2,7 @@
 #
 noarch=yes
 depends="cracklib-devel db-devel pam>=$version"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
+short_desc="${short_desc} -- development files"
 
 do_install() {
 	vmove usr/include usr
diff --git a/srcpkgs/pam/pam-userdb.template b/srcpkgs/pam/pam-userdb.template
index c2efa43c012..5b3c8996653 100644
--- a/srcpkgs/pam/pam-userdb.template
+++ b/srcpkgs/pam/pam-userdb.template
@@ -1,12 +1,6 @@
 # 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."
 
 do_install() {
 	vmove usr/lib/security/pam_userdb.so usr/lib/security
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index ad82bc80d2d..a7f62403de2 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,12 +1,14 @@
 # Template file for 'pam'
 pkgname=pam
 version=1.1.6
-revision=1
+revision=2
 wrksrc="Linux-PAM-$version"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --sbindir=/usr/sbin --docdir=/usr/share/doc/pam"
+depends="cracklib"
 subpackages="pam-devel pam-userdb"
 makedepends="flex cracklib-devel db-devel libtirpc-devel"
+crossmakedepends="libfl-devel cracklib-devel db-devel libtirpc-devel"
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org/pub/linux/libs/pam/"
@@ -14,9 +16,6 @@ license="GPL-2"
 #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"
 checksum=bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2
-long_desc="
- Linux-PAM provides a flexible mechanism for authenticating users.
- PAM was invented by SUN Microsystems."
 
 conf_files="
 /etc/environment
@@ -27,6 +26,13 @@ conf_files="
 /etc/security/pam_env.conf
 /etc/security/time.conf"
 
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	makedepends="flex automake gettext-devel pkg-config"
+	pre_configure() {
+		autoreconf -fi
+	}
+fi
+
 post_install() {
 	# Fix unix_chkpwd perms.
 	chmod 4755 ${DESTDIR}/usr/sbin/unix_chkpwd