diff --git a/srcpkgs/base-files/files/profile b/srcpkgs/base-files/files/profile
index 6247f4bc465..d18e7d7bf82 100644
--- a/srcpkgs/base-files/files/profile
+++ b/srcpkgs/base-files/files/profile
@@ -2,9 +2,6 @@
 
 # System wide environment and startup programs.
 
-#Set our umask
-umask 022
-
 # Set our default path
 PATH="/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/bin:/sbin"
 export PATH
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 87f2e72baf3..9c82fc1ffdc 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.114
-revision=1
+revision=2
 bootstrap=yes
 build_style="meta"
 depends="base-directories xbps-triggers"
diff --git a/srcpkgs/pam-base/files/system-auth b/srcpkgs/pam-base/files/system-auth
index 2645043603f..24eb0d78c6c 100644
--- a/srcpkgs/pam-base/files/system-auth
+++ b/srcpkgs/pam-base/files/system-auth
@@ -11,6 +11,7 @@ account   required  pam_time.so
 password  required  pam_unix.so     try_first_pass nullok sha512 shadow
 password  optional  pam_permit.so
 
+session   optional  pam_umask.so    usergroups
 session   required  pam_limits.so
 session   required  pam_unix.so
 session   optional  pam_permit.so
diff --git a/srcpkgs/pam-base/template b/srcpkgs/pam-base/template
index c49d361a2df..ba3d0f8c127 100644
--- a/srcpkgs/pam-base/template
+++ b/srcpkgs/pam-base/template
@@ -1,7 +1,7 @@
 # Template file for 'pam-base'
 pkgname=pam-base
 version=0.1
-revision=1
+revision=2
 noarch=yes
 short_desc="PAM base configuration files"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/shadow/files/login.defs b/srcpkgs/shadow/files/login.defs
index cde442ec4e5..de7f2d32135 100644
--- a/srcpkgs/shadow/files/login.defs
+++ b/srcpkgs/shadow/files/login.defs
@@ -74,7 +74,7 @@ TTYPERM 		0600
 #
 ERASECHAR 		0177
 KILLCHAR 		025
-UMASK 			077
+UMASK 			022
 
 # Max number of login retries if password is bad
 #
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index e2a8d6e5217..5cf7f9d7919 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,7 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
  --libdir=/usr/lib --enable-shared --disable-static