diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.5.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.5.recipe
index 74e6320e1..6ec2b1433 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.5.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.5.recipe
@@ -4,7 +4,7 @@ used in GnuPG."
 HOMEPAGE="http://directory.fsf.org/project/libgcrypt/"
 COPYRIGHT="2000-2013 Free Software Foundation, Inc."
 LICENSE="GNU LGPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f49ebc5842d455ae7019def33eb5a014a0f07a2a8353dc3aa50a76fd1dafa924"
 PATCHES="libgcrypt-$portVersion.patchset"
@@ -56,6 +56,9 @@ INSTALL()
 {
 	make install
 
+	#remove libtool file
+	rm -f $libDir/libgcrypt.la
+
 	prepareInstalledDevelLibs libgcrypt
 
 	packageEntries devel \
diff --git a/dev-libs/libgcrypt/libgcrypt-1.7.0.recipe b/dev-libs/libgcrypt/libgcrypt-1.7.0.recipe
new file mode 100644
index 000000000..967d0b94a
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.7.0.recipe
@@ -0,0 +1,66 @@
+SUMMARY="GNU's basic cryptographic library"
+DESCRIPTION="Libgcrypt is a general purpose crypto library based on the code \
+used in GnuPG."
+HOMEPAGE="http://directory.fsf.org/project/libgcrypt/"
+COPYRIGHT="2000-2013 Free Software Foundation, Inc."
+LICENSE="GNU LGPL v3"
+REVISION="1"
+SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
+CHECKSUM_SHA256="b0e67ea74474939913c4d9d9ef4ef5ec378efbe2bebe36389dee319c79bffa92"
+PATCHES="libgcrypt-$portVersion.patchset"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	libgcrypt${secondaryArchSuffix} = $portVersion compat >= 1.6
+	lib:libgcrypt${secondaryArchSuffix} = 20.1.0 compat >= 20
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix}
+	lib:libgpg_error${secondaryArchSuffix}
+	"
+
+PROVIDES_devel="
+	libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
+	devel:libgcrypt$secondaryArchSuffix = 20.1.0 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
+	"
+REQUIRES_devel="
+	libgcrypt${secondaryArchSuffix} == $portVersion base
+	haiku${secondaryArchSuffix}
+	devel:libgpg_error${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgpg_error${secondaryArchSuffix}
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc${secondaryArchSuffix}
+	"
+
+BUILD()
+{
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	#remove libtool file
+	rm -f $libDir/libgcrypt.la
+
+	prepareInstalledDevelLibs libgcrypt
+
+	packageEntries devel \
+		$developDir $binDir $manDir $dataDir $infoDir
+}
diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.7.0.patchset b/dev-libs/libgcrypt/patches/libgcrypt-1.7.0.patchset
new file mode 100644
index 000000000..cd0182883
--- /dev/null
+++ b/dev-libs/libgcrypt/patches/libgcrypt-1.7.0.patchset
@@ -0,0 +1,44 @@
+From 8f17f183b538b6c5bd20cc69e4dcd34913cd5c3e Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 5 Aug 2014 16:50:29 +0000
+Subject: haiku patch
+
+
+diff --git a/configure.ac b/configure.ac
+index f683e21..dabca44 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -747,6 +747,7 @@ fi
+ AC_SEARCH_LIBS(setsockopt, [socket], ,
+ 	[AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
+ AC_SEARCH_LIBS(setsockopt, [nsl])
++AC_SEARCH_LIBS(socket, [network])
+ 
+ ##################################
+ #### Checks for header files. ####
+-- 
+2.2.2
+
+
+From 2eb88a459c5386a816e74231bc04b4f8a5b42b1e Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 6 Aug 2014 22:08:04 +0000
+Subject: gcc2 patch
+
+
+diff --git a/src/hwf-x86.c b/src/hwf-x86.c
+index eeacccb..52fad3c 100644
+--- a/src/hwf-x86.c
++++ b/src/hwf-x86.c
+@@ -103,7 +103,7 @@ get_xgetbv(void)
+   unsigned int t_eax, t_edx;
+ 
+   asm volatile
+-    ("xgetbv\n\t"
++    (".byte 0x0f, 0x01, 0xd0\n\t"
+      : "=a" (t_eax), "=d" (t_edx)
+      : "c" (0)
+     );
+-- 
+2.2.2
+