diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 7a8908e..5e64818 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -29,12 +29,16 @@ validpgpkeys=(
 source=("https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
         'drop-import-clean.patch'
         'avoid-beta-warning.patch'
-			  'scd-Error-code-map-fix-for-older-Yubikey.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=01a413d5235f1bbd00f83fb86d0e183d8f0b1a57')
+        'Remove-use-of-USE_LDAPWRAPPER.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=8ee4c8d1e0d7677d4f8b9538c12b32bb6393c2c5'
+        'scd-Error-code-map-fix-for-older-Yubikey.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=01a413d5235f1bbd00f83fb86d0e183d8f0b1a57'
+        'Use-keyserver.ubuntu.com-as-the-default-keyserver.patch::https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=patch;h=47c4e3e00a7ef55f954c14b3c237496e54a853c1')
 sha256sums=('6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec'
             'SKIP'
             '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
             '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
-            '3d01999fcde60851898a06ef4a0b7497f44f65fe0655522bc7aef52c83960b3c')
+            '58207af5c4b059781a4fbb1de9a809faec11073e24b1069aa11678a768804847'
+            '3d01999fcde60851898a06ef4a0b7497f44f65fe0655522bc7aef52c83960b3c'
+            'db06cf1ff079e3387012886643554e3d6a2df0e44ebd781fcbc2b89a2e226ba9')
 
 install=install
 
@@ -42,7 +46,10 @@ prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../avoid-beta-warning.patch
 	patch -p1 -i ../drop-import-clean.patch
+	patch -p1 -i ../Remove-use-of-USE_LDAPWRAPPER.patch
 	patch -p1 -i ../scd-Error-code-map-fix-for-older-Yubikey.patch
+	patch -p1 -i ../Use-keyserver.ubuntu.com-as-the-default-keyserver.patch
+
 
 	# improve reproducibility
 	rm doc/gnupg.info*