diff --git a/linux/trunk/PKGBUILD b/linux/trunk/PKGBUILD
index b98fb68f473..1ec92dd9a86 100644
--- a/linux/trunk/PKGBUILD
+++ b/linux/trunk/PKGBUILD
@@ -18,6 +18,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
         # the main kernel config files
         'config.i686' 'config.x86_64'
+        'fix-mac80211-teardown.patch::https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch?id=98e93e968e4947cd71c2eb69e323682daa453ee7'
+        'fix-mac80211-deadlock.patch::https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch?id=bde59c475e0883e4c4294bcd9b9c7e08ae18c828'
         # pacman hook for initramfs regeneration
         '90-linux.hook'
         # standard config files for mkinitcpio ramdisk
@@ -29,6 +31,8 @@ sha256sums=('2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c'
             'SKIP'
             '73278ee56c5d3855e67ff50caa77a7cb47fb29ebd8f9b7ca9ebee4e2d446529c'
             '1b9cbe1c25653d563515344a7c6cc9f79447ac9274fcf4de0007228e979b55dd'
+            '91ce3cbc3dce315845769316837b7f085d9d2805bdd9222f3fea12778b26b7da'
+            '2e8d13ea05077d8b9c556334ca426cef604426a82a4870f4c599db1c72857d33'
             '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 validpgpkeys=(
@@ -42,7 +46,9 @@ prepare() {
   cd ${_srcname}
 
   # add upstream patch
-  patch -p1 -i ../patch-${pkgver}
+  patch -Np1 -i "../patch-$pkgver"
+  patch -Np1 <../fix-mac80211-teardown.patch
+  patch -Np1 <../fix-mac80211-deadlock.patch
 
   # security patches