diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 9e952c3..58b85b2 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -18,11 +18,27 @@ depends=(gdbm libgdbm.so glibc openssl)
 makedepends=(krb5 libldap mariadb-libs postgresql-libs sqlite)
 provides=(libsasl2.so)
 options=(debug)
-source=(https://github.com/cyrusimap/$_name/releases/download/$_name-$pkgver/$_name-$pkgver.tar.gz{,.sig})
+source=(https://github.com/cyrusimap/$_name/releases/download/$_name-$pkgver/$_name-$pkgver.tar.gz{,.sig}
+        https://github.com/cyrusimap/cyrus-sasl/commit/887dbc0435056ec58ee48c4d803f110ade1e4c39.patch # Gracefully handle failed cipher initializations
+        https://github.com/cyrusimap/cyrus-sasl/commit/dfaa62392e7caecc6ecf0097b4d73738ec4fc0a8.patch # Catch errors from EVP_Digest* functions
+        https://github.com/cyrusimap/cyrus-sasl/commit/c2bd3afbca57f176d8c650670ce371444bb7fcc0.patch # Add a HMAC wrapper for deprecated function
+        https://github.com/cyrusimap/cyrus-sasl/commit/54f69880fa92bb0d0cf4d55bab0914822a873d8d.patch # Add support for loading legacy provider
+        https://github.com/cyrusimap/cyrus-sasl/commit/725df6cdadc11cf1bbbfa3a57982ec19624c6fbe.patch # Drop RC4 custom code and "export" options
+        )
 sha512sums=('db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78'
-            'SKIP')
+            'SKIP'
+            '6b7bfdb91e8ce95a582f295f562e3f2385623b6f95f87b995b44c2872bb4121d3cb83cbbd48d3d9d405d30abdaf246d62d5c461602e79532994b413cd5936a03'
+            '9487615bfca094921121a20062a061da34c517ac272f648e23bd015af2cf386267206ffb52f81ad0985d2ec433b361d3b8a80d1890252c948455c5269d70b6d2'
+            '47c37e14a71a44fd126caba0ff7d340724ed2e283ed6396530a4782b82b710debd9ff3adf516c6c9ab0ca7bba537e84ae8ff302094ab1a114a602df7ed5e7acb'
+            'c124e407fe5eeace728b22fe107daba7581005312a6ddeeaa5f869d6f1b1ff8b5ba0ff7b1862a5238b7100ffc53ed6b7bb57f21b4e68b5433396f3cf914598d4'
+            '83b8795ade33399dded6d4dbcf1a7b5bc91145f1ffbe6ab2b7cf86f375a4729b7fa5c7ad7af5e60e4ff88067393d08c5e76c81f7c59ba3f13c6e8fc1fe7b6a7d')
 b2sums=('6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823'
-        'SKIP')
+        'SKIP'
+        'bb4621c826086a02d2eb6c6de9d334ae77c9781e5bb6560e2ab7ee584ef55fcc9dde96e5916565fc3f7095fa4df19e100a521890511c0ee94f3c14fae98ed2b5'
+        'f55aa76e670c98169fc0b592ec704dea8385f00f03c63eda344d5c63439fcc3c665731d6fde5b4bc0c69ba4c5add1c61623af5bf82afca3b757cc1de3c4b0550'
+        '01322895ecfa3a39c3b60f644cbb8bfcd4f61f219a166f2e87e7902e75978121d9418f596116f24e696245912bdd12cefb7ce56485f2b2382443b22f88aa024c'
+        '145c83ece1f6bd3691cb3a58d1f6398092ad57cd2bc8c5abf44127cf5593bf5029ace442edb64b5eedf93c3d42c4caf243b89dce549b14cb9d5563710e397623'
+        '940e26037575f03d62267662c3961bc9caf8639c2bfa8d19a00e2ada606ea7f9020a6de2b2557b432a1534764447f0ebf4c77a9a42b329bdb81159b336b0780f')
 validpgpkeys=(
   '829F339F8C296FE80F409D93E3D7C118C7B9F46A'  # Partha Susarla <mail@spartha.org>
   'DEA1999F0CDB1AAEBA001E0DBEE3E3B4D2F06546'  # Quanah Gibson-Mount <quanah@fast-mail.org>
@@ -30,6 +46,11 @@ validpgpkeys=(
 
 prepare() {
   cd $_name-$pkgver
+  patch -Np1 -i ../887dbc0435056ec58ee48c4d803f110ade1e4c39.patch
+  patch -Np1 -i ../dfaa62392e7caecc6ecf0097b4d73738ec4fc0a8.patch
+  patch -Np1 -i ../c2bd3afbca57f176d8c650670ce371444bb7fcc0.patch
+  patch -Np1 -i ../54f69880fa92bb0d0cf4d55bab0914822a873d8d.patch
+  patch -Np1 -i ../725df6cdadc11cf1bbbfa3a57982ec19624c6fbe.patch
   autoreconf -fiv
 }