diff --git a/config/APT_overlays.d/bugfix-15792-thunderbird-60.0 b/config/APT_overlays.d/bugfix-15792-thunderbird-60.0
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/config/chroot_local-hooks/11-check-thunderbird-addons b/config/chroot_local-hooks/11-check-thunderbird-addons
index 9c75dcee66a191de44443033c3a1e9373c129c61..e4612ded12e539251fa754deaa0b8d77da623367 100755
--- a/config/chroot_local-hooks/11-check-thunderbird-addons
+++ b/config/chroot_local-hooks/11-check-thunderbird-addons
@@ -5,7 +5,7 @@ set -u
 
 echo "Checking for Thunderbird language packages"
 
-SUFFIX="@firefox.mozilla.org.xpi"
+SUFFIX="@thunderbird.mozilla.org.xpi"
 LANG_PACK_COUNT=$(find /usr/share/thunderbird/extensions/ -name "langpack-*${SUFFIX}" | wc -l)
 
 if [ "$LANG_PACK_COUNT" = "0" ]; then
diff --git a/config/chroot_local-patches/apparmor-adjust-thunderbird-profile.diff b/config/chroot_local-patches/apparmor-adjust-thunderbird-profile.diff
index 98d8ea2136572e622e1992b04de25e0cd1a7ba41..30c4e068faa7b0f96e85cf4e4a73eb9f1e94cfbc 100644
--- a/config/chroot_local-patches/apparmor-adjust-thunderbird-profile.diff
+++ b/config/chroot_local-patches/apparmor-adjust-thunderbird-profile.diff
@@ -1,5 +1,5 @@
---- a/etc/apparmor.d/usr.bin.thunderbird	2018-08-05 00:20:51.000000000 +0000
-+++ b/etc/apparmor.d/usr.bin.thunderbird	2018-08-10 00:59:40.694546662 +0000
+--- a/etc/apparmor.d/usr.bin.thunderbird	2018-08-19 09:32:11.000000000 +0000
++++ b/etc/apparmor.d/usr.bin.thunderbird	2018-08-21 07:03:51.744244552 +0000
 @@ -16,7 +16,6 @@
    # TODO: finetune this for required accesses
    #include <abstractions/dbus>
@@ -21,7 +21,7 @@
    # Allow opening attachments
    # TODO: create and use abstractions for opening various file formats
 -  /{usr/local/,usr/,}bin/* Cx -> sanitized_helper,
-+  /{usr/local/,usr/,}bin/{[^g],g[^p],gp[^g]}* Cx -> sanitized_helper,
++  /{usr/local/,usr/,}bin/{[^gp],g[^p],p[^s],gp[^g]}* Cx -> sanitized_helper,
    /usr/lib/libreoffice/program/soffice Cxr -> sanitized_helper,
  
 -  # For Xubuntu to launch the browser