diff --git a/srcpkgs/pam/pam-devel.template b/srcpkgs/pam/pam-devel.template
index 8ed141415d..5c0cb7c353 100644
--- a/srcpkgs/pam/pam-devel.template
+++ b/srcpkgs/pam/pam-devel.template
@@ -11,9 +11,6 @@ Add_dependency run pam
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/lib/security
-	mkdir -p ${DESTDIR}/usr/share/man
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+	vmove usr/include usr
+	vmove usr/share/man/man3 usr/share/man
 }
diff --git a/srcpkgs/pam/pam-userdb.template b/srcpkgs/pam/pam-userdb.template
index 5c5058d885..c8e4251a82 100644
--- a/srcpkgs/pam/pam-userdb.template
+++ b/srcpkgs/pam/pam-userdb.template
@@ -8,19 +8,12 @@ long_desc="${long_desc}
  username, and the data fields corresponding to the username keys are the
  passwords."
 
-revision=1
-
 Add_dependency run glibc
 Add_dependency run libdb
 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
+	vmove lib/security/pam_userdb.so lib/security
+	vmove usr/share/man/man8/pam_userdb.8 usr/share/man/man8
 }
diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template
index 70ea5a07ad..4469d663b3 100644
--- a/srcpkgs/pam/template
+++ b/srcpkgs/pam/template
@@ -1,15 +1,14 @@
 # Template file for 'pam'
 pkgname=pam
-version=1.1.3
+version=1.1.4
 wrksrc="Linux-PAM-$version"
 distfiles="${KERNEL_SITE}/libs/pam/library/Linux-PAM-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--disable-selinux --libdir=/lib --disable-rpath
- --docdir=/usr/share/doc/pam --enable-read-both-confs
- DESTDIR=$XBPS_DESTDIR/$pkgname-$version"
+build_style=custom-install
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=17b268789b935a76e736a1150210dd12f156972973e79347668f828d43632652
+homepage="http://www.kernel.org/pub/linux/libs/pam/"
+license="GPL-2"
+checksum=ccd89331914390b1e9e99c954471d65f19b660d81e15a46eeb96cee125d44056
 long_desc="
  Linux-PAM provides a flexible mechanism for authenticating users.
  PAM was invented by SUN Microsystems."
@@ -31,8 +30,18 @@ Add_dependency build gettext
 Add_dependency build cracklib-devel
 Add_dependency build db-devel
 
-post_install()
+do_build()
 {
+	./configure ${CONFIGURE_SHARED_ARGS} --disable-selinux --libdir=/lib \
+		--disable-rpath --docdir=/usr/share/doc/pam \
+		--enable-read-both-confs DESTDIR=${DESTDIR}
+	make ${makejobs}
+}
+
+do_install()
+{
+	make DESTDIR=${DESTDIR} install
+
 	rm -rf ${DESTDIR}/var
 	# Fix unix_chkpwd perms.
 	chmod 4755 ${DESTDIR}/sbin/unix_chkpwd
@@ -42,6 +51,6 @@ post_install()
 	# at least to dash and bash.
 	#
 	sed -i -e "s|^#!/bin/sh -p$|#!/bin/sh|" \
-		${DESTDIR}/etc/security/namespace.init || return 1
-	chmod 755 ${DESTDIR}/etc/security/namespace.init || return 1
+		${DESTDIR}/etc/security/namespace.init
+	chmod 755 ${DESTDIR}/etc/security/namespace.init
 }