diff --git a/Changelog b/Changelog
index b1f791790..f4ed5d77b 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Pam and samba updates from Stefan Schulze Frielinghaus.
 - Backup update on Debian from Vaclav Ovsik.
 - Cracklib update on Debian from Vaclav Ovsik.
 - Label /proc/kallsyms with system_map_t.
diff --git a/policy/modules/services/samba.te b/policy/modules/services/samba.te
index 513f45054..a218d5ee1 100644
--- a/policy/modules/services/samba.te
+++ b/policy/modules/services/samba.te
@@ -1,5 +1,5 @@
 
-policy_module(samba,1.7.0)
+policy_module(samba,1.7.1)
 
 #################################
 #
@@ -222,7 +222,7 @@ allow smbd_t self:unix_stream_socket { create_stream_socket_perms connectto };
 allow smbd_t samba_etc_t:file { rw_file_perms setattr };
 
 create_dirs_pattern(smbd_t,samba_log_t,samba_log_t)
-create_files_pattern(smbd_t,samba_log_t,samba_log_t)
+manage_files_pattern(smbd_t,samba_log_t,samba_log_t)
 allow smbd_t samba_log_t:dir setattr;
 dontaudit smbd_t samba_log_t:dir remove_name;
 
diff --git a/policy/modules/system/authlogin.fc b/policy/modules/system/authlogin.fc
index 1b315f5f9..fdfd1e5be 100644
--- a/policy/modules/system/authlogin.fc
+++ b/policy/modules/system/authlogin.fc
@@ -41,4 +41,5 @@ ifdef(`distro_gentoo', `
 
 /var/run/console(/.*)?	 	gen_context(system_u:object_r:pam_var_console_t,s0)
 
+/var/run/pam_mount(/.*)?	gen_context(system_u:object_r:pam_var_run_t,s0)
 /var/run/sudo(/.*)?		gen_context(system_u:object_r:pam_var_run_t,s0)
diff --git a/policy/modules/system/authlogin.te b/policy/modules/system/authlogin.te
index b7b0f785f..4649ab3c3 100644
--- a/policy/modules/system/authlogin.te
+++ b/policy/modules/system/authlogin.te
@@ -1,5 +1,5 @@
 
-policy_module(authlogin,1.9.1)
+policy_module(authlogin,1.9.2)
 
 ########################################
 #