diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index b3ccde5..85358eb 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -26,15 +26,32 @@ optdepends=(
 source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc}
         samba.logrotate
         samba.pam
-        samba.conf)
+        samba.conf
+        https://gitlab.com/samba-team/devel/samba/-/commit/52ddfacead1ba50da0fc706b54e90e7a0cadb8e9.patch
+        https://gitlab.com/samba-team/devel/samba/-/commit/159a03a9067f7aeddb29080dc34e37b567a02479.patch
+        https://gitlab.com/samba-team/devel/samba/-/commit/523ccc98d2c6a9ddc0714084b5e19cee2a80bf27.patch
+        https://gitlab.com/samba-team/devel/samba/-/commit/8cf00e6d64b098c8c21656e9f56d389758503dcd.patch)
 validpgpkeys=('52FBC0B86D954B0843324CDC6F33915B6568B7EA') #Samba Distribution Verification Key <samba-bugs@samba.org>
 sha512sums=('0c15e887efa79ba8c1d24eda2f03898a1a080cb947056df12abc361f12eb5659f9ee37132767f5ef7e4ecb9c431759e5b619cb785921276fda17f4a9411af81c'
             'SKIP'
             '2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858'
             '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
-            'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc')
+            'e46ee848baabb261e7468ecee43aba4d001a24f86f5322ae522abdb75030fd0ebd9063b9df0be3576c4d1654d81331f5e389aee16ec2fa138259ae4728e94efc'
+            '181252aaa3960c264f7a63559d158571872f731b0aaddd54d412141ceb5f178244224bfe4ff357258fe53824bd8487b4d4fa80aa13ca59326f7c9db40d204c85'
+            '2ef0cb07d7d3c033d043e829048298ef1de5ce18061d59052647e560bf053c2cc62808d6868ca27dea8a206b6d7eaa1c0bbe79669f365827e52ad5aa9d0fcbb3'
+            '9c58d327d6ec829db99514d82bec267803b3110eb9bc347e939e3ef8787e791abebe7549791e5cede59e2c2cc95fc30ac8c259d3a591b7ef985250cbcbf22c4f'
+            '64720590768e1b293fdc9eeff04269340af29c124d9e37ff5be9a49f608dee6f299cb6cd18a94a114f943f4f9f5d35ea5a2645cd4c607cbe6f3bb60a8020592b')
 ### UNINSTALL dmapi package before building!!!
 
+prepare()
+{
+  cd samba-${pkgver}
+  patch -p1 -i ../52ddfacead1ba50da0fc706b54e90e7a0cadb8e9.patch
+  patch -p1 -i ../159a03a9067f7aeddb29080dc34e37b567a02479.patch
+  patch -p1 -i ../523ccc98d2c6a9ddc0714084b5e19cee2a80bf27.patch
+  patch -p1 -i ../8cf00e6d64b098c8c21656e9f56d389758503dcd.patch
+}
+
 build() {
   # Use samba-pkg as a staging directory for the split packages
   # (This is so RPATHS and symlinks are generated correctly via