diff --git a/profiles/apparmor.d/abstractions/user-manpages b/profiles/apparmor.d/abstractions/user-manpages
index 2a0e7e217..b7cc0cb8e 100644
--- a/profiles/apparmor.d/abstractions/user-manpages
+++ b/profiles/apparmor.d/abstractions/user-manpages
@@ -10,6 +10,7 @@
 
   # perhaps your configuration has users elsewhere, or you don't wish
   # them to read their own manpages
+  owner @{HOME}/man/                          r,
   owner @{HOME}/man/**                        r,
   owner @{HOME}/tmp/groff*                    rwl,
 
diff --git a/profiles/apparmor/profiles/extras/usr.lib.man-db.man b/profiles/apparmor/profiles/extras/usr.lib.man-db.man
index 5df163082..3e7620ca3 100644
--- a/profiles/apparmor/profiles/extras/usr.lib.man-db.man
+++ b/profiles/apparmor/profiles/extras/usr.lib.man-db.man
@@ -17,33 +17,52 @@
   #include <abstractions/consoles>
   #include <abstractions/user-manpages>
 
-  /etc/manpath.config r,
-  /usr/lib/man-db/man rmix,
-
   /bin/bash rmix,
   /bin/cat rmix,
   /bin/gunzip rmix,
+  /bin/mktemp rmix,
   /bin/more rmix,
+  /bin/rm rmix,
+
+  /etc/groff/man.local r
   /etc/lesskey.bin r,
+  /etc/manpath.config r,
   /etc/man.config r,
   /etc/papersize r,
   /etc/termcap r,
+
+  /tmp/nroff.** rw,
+
   /usr/man/** r,
   /usr/bin/apropos Px,
   /usr/bin/cmp rmix,
+  /usr/bin/getopt rmix,
   /usr/bin/groff rmix,
   /usr/bin/grops rmix,
   /usr/bin/grotty rmix,
   /usr/bin/iconv rmix,
-  /usr/bin/less rmix,
+  /{usr/,}bin/less rmix,
   /usr/bin/locale rmix,
   /usr/bin/man rmix,
   /usr/bin/nroff rmix,
+  /usr/bin/preconv rmix,
   /usr/bin/tbl rmix,
   /usr/bin/troff rmix,
   /usr/bin/zsoelim rmix,
+  /usr/lib/man-db/man rmix,
+  /usr/lib/man-db/manconv rmix,
+  /usr/local/man/ r,
+  /usr/local/man/** r,
+  /usr/local/share/man/ r,
+  /usr/local/share/man/** r,
   /usr/share/groff/** r,
+  /usr/share/locale-bundle/** r,
+  /usr/share/man/ r,
+  /usr/share/man/** r,
   /usr/share/terminfo/** r,
   /usr/share/texmf/teTeX/man/** r,
-  /var/cache/man/** r,
+
+  /var/cache/man/** rk,
+
+  owner @{HOME}/.lesshst rw,
 }