diff --git a/profiles/apparmor.d/abstractions/samba b/profiles/apparmor.d/abstractions/samba
index c695441e5..dd0d8af93 100644
--- a/profiles/apparmor.d/abstractions/samba
+++ b/profiles/apparmor.d/abstractions/samba
@@ -9,11 +9,11 @@
 #
 # ------------------------------------------------------------------
 
-  /etc/samba/smb.conf r,
+  /etc/samba/* r,
   /usr/share/samba/*.dat r,
   /var/lib/samba/**.tdb rwk,
   /var/log/samba/cores/ rw,
-  /var/log/samba/cores/* w,
+  /var/log/samba/cores/** rw,
   /var/log/samba/log.* w,
   /{,var/}run/samba/*.tdb rw,
 
diff --git a/profiles/apparmor.d/usr.sbin.nmbd b/profiles/apparmor.d/usr.sbin.nmbd
index c662de2df..4d619fd41 100644
--- a/profiles/apparmor.d/usr.sbin.nmbd
+++ b/profiles/apparmor.d/usr.sbin.nmbd
@@ -8,12 +8,9 @@
   capability net_bind_service,
 
   /usr/sbin/nmbd mr,
-  /var/cache/samba/browse.dat* rw,
-  /var/lib/samba/wins.dat* rw,
-  /{,var/}run/samba/** rk,
-  /{,var/}run/samba/nmbd.pid rw,
-  /var/log/samba/cores/nmbd/ rw,
-  /var/log/samba/cores/nmbd/** rw,
+  /var/{cache,lib}/samba/browse.dat* rw,
+  /var/{cache,lib}/samba/wins.dat* rw,
+  /{,var/}run/samba/** rwk,
 
   # Site-specific additions and overrides. See local/README for details.
   #include <local/usr.sbin.nmbd>
diff --git a/profiles/apparmor.d/usr.sbin.smbd b/profiles/apparmor.d/usr.sbin.smbd
index 5a3611a4b..ed5118f66 100644
--- a/profiles/apparmor.d/usr.sbin.smbd
+++ b/profiles/apparmor.d/usr.sbin.smbd
@@ -24,6 +24,7 @@
   /etc/printcap r,
   /proc/*/mounts r,
   /usr/sbin/smbd mr,
+  /etc/samba/* rwk,
   /var/cache/samba/** rwk,
   /var/cache/samba/printing/printers.tdb mrw,
   /var/lib/samba/** rwk,