diff --git a/dev-libs/libgcrypt/libgcrypt-1.7.8.recipe b/dev-libs/libgcrypt/libgcrypt-1.7.10.recipe
similarity index 61%
rename from dev-libs/libgcrypt/libgcrypt-1.7.8.recipe
rename to dev-libs/libgcrypt/libgcrypt-1.7.10.recipe
index 0225d1180..c5e8153d2 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.7.8.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.7.10.recipe
@@ -2,19 +2,23 @@ SUMMARY="GNU's basic cryptographic library"
 DESCRIPTION="Libgcrypt is a general purpose crypto library based on the code \
 used in GnuPG."
 HOMEPAGE="https://gnupg.org/related_software/libgcrypt/"
-COPYRIGHT="2000-2017 Free Software Foundation, Inc."
+COPYRIGHT="2000-2018 Free Software Foundation, Inc."
 LICENSE="GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
-CHECKSUM_SHA256="948276ea47e6ba0244f36a17b51dcdd52cfd1e664b0a1ac3bc82134fb6cec199"
+CHECKSUM_SHA256="89f05a423dd66a25e5b38308097e2386e640d1cf835160d19a5c75350071d94c"
 PATCHES="libgcrypt-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion=20.1.10
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= 1.6"
 
 PROVIDES="
-	libgcrypt$secondaryArchSuffix = $portVersion compat >= 1.6
-	lib:libgcrypt$secondaryArchSuffix = 20.1.8 compat >= 20
+	libgcrypt$secondaryArchSuffix = $portVersionCompat
+	lib:libgcrypt$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -22,12 +26,12 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
-	devel:libgcrypt$secondaryArchSuffix = 20.1.8 compat >= 20
-	cmd:dumpsexp$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:libgcrypt_config$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:hmac256$secondaryArchSuffix = $portVersion compat >= 1.6
-	cmd:mpicalc$secondaryArchSuffix = $portVersion compat >= 1.6
+	libgcrypt${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libgcrypt$secondaryArchSuffix = $libVersionCompat
+	cmd:dumpsexp$secondaryArchSuffix = $portVersionCompat
+	cmd:hmac256$secondaryArchSuffix = $portVersionCompat
+	cmd:libgcrypt_config$secondaryArchSuffix = $portVersionCompat
+	cmd:mpicalc$secondaryArchSuffix = $portVersionCompat
 	"
 REQUIRES_devel="
 	libgcrypt$secondaryArchSuffix == $portVersion base
@@ -46,6 +50,9 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libgcrypt$secondaryArchSuffix \
+	"$libDir"/libgcrypt.so.$libVersion
+
 BUILD()
 {
 	autoconf
diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.7.8.patchset b/dev-libs/libgcrypt/patches/libgcrypt-1.7.10.patchset
similarity index 97%
rename from dev-libs/libgcrypt/patches/libgcrypt-1.7.8.patchset
rename to dev-libs/libgcrypt/patches/libgcrypt-1.7.10.patchset
index b0293db9c..5b973f15b 100644
--- a/dev-libs/libgcrypt/patches/libgcrypt-1.7.8.patchset
+++ b/dev-libs/libgcrypt/patches/libgcrypt-1.7.10.patchset
@@ -5,7 +5,7 @@ Subject: haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index 487a1bc..aa8bc7a 100644
+index 76e25d6..4af25ea 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -763,6 +763,7 @@ fi