diff --git a/pam.d/systemd-user b/pam.d/systemd-user
index 2725df9..8607d4f 100644
--- a/pam.d/systemd-user
+++ b/pam.d/systemd-user
@@ -2,6 +2,7 @@
 #
 # Used by systemd --user instances.
 
+account  sufficient pam_unix.so no_pass_expiry
 account  include system-auth
 
 session  required pam_selinux.so close
diff --git a/selinux/targeted/.policy.sha512 b/selinux/targeted/.policy.sha512
index 6f4c53c..af9b14d 100644
--- a/selinux/targeted/.policy.sha512
+++ b/selinux/targeted/.policy.sha512
@@ -1 +1 @@
-313aa6e260e36bec688cdb1466515f51036162f94227d0e6511c4ee68deafc8a77873e247d3a883fe3c2985a5a188f5d8295c53faa15d6737290aad495a09662
+d4fd17421900e5952bfdc4d465cc49f7947b18125eaffc27862e0024c386b792c8da1f3e7c1697ab9b923e4d392afcf01e7f7d07f65480c7c7fdc051ccc2c0e0
diff --git a/selinux/targeted/contexts/files/file_contexts b/selinux/targeted/contexts/files/file_contexts
index 2cdad61..0187c38 100644
--- a/selinux/targeted/contexts/files/file_contexts
+++ b/selinux/targeted/contexts/files/file_contexts
@@ -5833,6 +5833,7 @@
 /usr/libexec/pcp/lib/pmproxy	--	system_u:object_r:pcp_pmproxy_initrc_exec_t:s0
 /usr/libexec/postfix/cleanup	--	system_u:object_r:postfix_cleanup_exec_t:s0
 /usr/libexec/postfix/virtual	--	system_u:object_r:postfix_virtual_exec_t:s0
+/usr/libexec/samba/rpcd_lsad	--	system_u:object_r:winbind_rpcd_exec_t:s0
 /usr/libexec/telepathy-rakia	--	system_u:object_r:telepathy_sofiasip_exec_t:s0
 /usr/libexec/telepathy-salut	--	system_u:object_r:telepathy_salut_exec_t:s0
 /usr/libexec/udisks2/udisksd	--	system_u:object_r:devicekit_disk_exec_t:s0
@@ -6073,6 +6074,7 @@
 /usr/libexec/openssh/sftp-server	--	system_u:object_r:bin_t:s0
 /usr/libexec/openssh/ssh-keysign	--	system_u:object_r:ssh_keysign_exec_t:s0
 /usr/libexec/openssh/sshd-keygen	--	system_u:object_r:sshd_keygen_exec_t:s0
+/usr/libexec/samba/samba-dcerpcd	--	system_u:object_r:winbind_rpcd_exec_t:s0
 /usr/libexec/squid/cache_swap\.sh	--	system_u:object_r:squid_exec_t:s0
 /usr/libexec/telepathy-butterfly	--	system_u:object_r:telepathy_msn_exec_t:s0
 /usr/sbin/abrt-install-ccpp-hook	--	system_u:object_r:abrt_exec_t:s0
diff --git a/selinux/targeted/contexts/files/file_contexts.bin b/selinux/targeted/contexts/files/file_contexts.bin
index 185c94c..68d42aa 100644
Binary files a/selinux/targeted/contexts/files/file_contexts.bin and b/selinux/targeted/contexts/files/file_contexts.bin differ
diff --git a/selinux/targeted/policy/policy.31 b/selinux/targeted/policy/policy.31
index 4a42c97..9c142ed 100644
Binary files a/selinux/targeted/policy/policy.31 and b/selinux/targeted/policy/policy.31 differ
diff --git a/vmware-tools/tools.conf.example b/vmware-tools/tools.conf.example
index 5679887..bfcf952 100644
--- a/vmware-tools/tools.conf.example
+++ b/vmware-tools/tools.conf.example
@@ -245,6 +245,28 @@
 # whether to include reserved space in diskInfo space metrics on Linux
 #diskinfo-include-reserved=false
 
+[globalconf]
+
+# The GlobalConf feature provides an ability for the vSphere administrators
+# to distribute a 'VMware Tools Configuration File' (tools.conf) via the
+# GuestStore for multiple VMs at scale.
+
+# Defines the configuration to enable/disable the GlobalConf module.
+# Set to true to enable the module.
+# Set to false to disable the module. Default false.
+#enabled=false
+
+# Defines a custom GlobalConf poll interval (in seconds).
+# Default 3600 seconds. Minimum 1800 seconds.
+#poll-interval=3600
+
+# Defines the global configuration resource in GuestStore.
+# Windows guests
+#resource=/vmware/configurations/vmtools/windows/tools.conf
+#
+# Linux guests
+#resource=/vmware/configurations/vmtools/linux/tools.conf
+
 [componentmgr]
 
 # This plugin manages the known and enabled components add/remove status.