diff --git a/pam/PKGBUILD b/pam/PKGBUILD
index 3a6239474..32b847d15 100644
--- a/pam/PKGBUILD
+++ b/pam/PKGBUILD
@@ -1,43 +1,48 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas[at]chakra-project[dog]org>
+# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=pam
-pkgver=1.1.3
-pkgrel=3
+pkgver=1.1.5
+pkgrel=1
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.kernel.org/pub/linux/libs/pam/"
-groups=('base')
-depends=('glibc' 'db>=4.8' 'cracklib')
-makedepends=('flex')
+depends=('glibc' 'db' 'cracklib' 'libtirpc')
+makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
 backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment)
-source=(http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 \
-        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2 \
+source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
+        #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
+        ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2
         other)
 options=('!libtool' '!emptydirs')
-md5sums=('6db7fcb5db6253350e3a4648ceac40e7'
+md5sums=('927ee5585bdec5256c75117e9348aa47'
          'e2788389a6c59224110a45fcff30e02b'
-         '6e6c8719e5989d976a14610f340bd33a')
+         'ac4900287a767654a3e8d9251a43f5e4')
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
-  ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib
-  make || return 1
-  make INSTALL=/bin/install DESTDIR=$pkgdir install
+  ./configure --libdir=/usr/lib
+  make
+
+  cd $srcdir/pam_unix2-2.6
+  ./configure --libdir=/usr/lib
+  make
+}
+
+package() {
+  cd $srcdir/Linux-PAM-$pkgver
+  make DESTDIR=$pkgdir install
   install -D -m644 ../other $pkgdir/etc/pam.d/other
+
   # build pam_unix2 module
   # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
   cd $srcdir/pam_unix2-2.6
-  ./configure
-  make || return 1
   make DESTDIR=$pkgdir install
+
   # add the realtime permissions for audio users
   sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf
   cat >>$pkgdir/etc/security/limits.conf <<_EOT
@@ -47,12 +52,15 @@ build() {
 @audio          -       nice           -10
 @audio          -       memlock         40000
 _EOT
+
   # fix some missing symlinks from old pam for compatibility
-  cd $pkgdir/lib/security
+  cd $pkgdir/usr/lib/security
   ln -s pam_unix.so pam_unix_acct.so
   ln -s pam_unix.so pam_unix_auth.so
   ln -s pam_unix.so pam_unix_passwd.so
   ln -s pam_unix.so pam_unix_session.so
+
   # set unix_chkpwd uid
   chmod +s $pkgdir/sbin/unix_chkpwd
 }
+
diff --git a/pam/other b/pam/other
index 08498b423..a5ca6faa5 100644
--- a/pam/other
+++ b/pam/other
@@ -1,5 +1,5 @@
 #%PAM-1.0
-auth		required	pam_unix.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
+auth		required 	pam_unix.so
+account		required 	pam_unix.so
+password         required	pam_unix.so
+session		required 	pam_unix.so