diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe
new file mode 100644
index 000000000..42e170428
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe
@@ -0,0 +1,67 @@
+SUMMARY="GNU's basic cryptographic library."
+DESCRIPTION="
+Libgcrypt is a general purpose crypto library based on the code \
+used in GnuPG.
+"
+LICENSE="GNU LGPL v3"
+COPYRIGHT="2000-2013 Free Software Foundation, Inc."
+HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" 
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
+CHECKSUM_SHA256="a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070"
+REVISION="1"
+ARCHITECTURES="x86"
+
+PATCHES="libgcrypt-$portVersion.patchset"
+
+PROVIDES="
+	libgcrypt${secondaryArchSuffix} = $portVersion compat >= 1.6
+	lib:libgcrypt${secondaryArchSuffix} = 20.0.1 compat >= 20
+	"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libgpg_error${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libgpg_error${secondaryArchSuffix}
+	"
+
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc${secondaryArchSuffix}
+	"
+
+BUILD()
+{
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libgcrypt
+
+	packageEntries devel \
+		$developDir $binDir
+}
+
+PROVIDES_devel="
+	libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
+	devel:libgcrypt = 20.0.1 compat >= 20
+	cmd:dumpsexp = $portVersion compat >= 1.6
+	cmd:libgcrypt_config = $portVersion compat >= 1.6
+	cmd:hmac256 = $portVersion compat >= 1.6
+	cmd:mpicalc = $portVersion compat >= 1.6
+	"
+
+REQUIRES_devel="
+	libgcrypt${secondaryArchSuffix} == $portVersion base
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	libgpg_error${secondaryArchSuffix}
+	"
diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.6.1.patchset b/dev-libs/libgcrypt/patches/libgcrypt-1.6.1.patchset
new file mode 100644
index 000000000..63ea8e0ba
--- /dev/null
+++ b/dev-libs/libgcrypt/patches/libgcrypt-1.6.1.patchset
@@ -0,0 +1,43 @@
+From bb32b84d069050b042902ba107eea7f7f17c6759 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 b/configure
+index 12b0833..a1eed44 100755
+--- a/configure
++++ b/configure
+@@ -18251,7 +18251,7 @@ esac
+ #
+ # Provide information about the build.
+ #
+-BUILD_REVISION="8804b9a"
++BUILD_REVISION=""
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -18260,7 +18260,7 @@ _ACEOF
+ 
+ 
+ BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
+-BUILD_FILEVERSION="${BUILD_FILEVERSION}34820"
++BUILD_FILEVERSION="${BUILD_FILEVERSION}0"
+ 
+ 
+ BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
+diff --git a/configure.ac b/configure.ac
+index dfbccb7..ff6b7d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -744,6 +744,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. ####
+-- 
+1.8.3.4
+
diff --git a/dev-libs/libgpg_error/libgpg_error-1.13.recipe b/dev-libs/libgpg_error/libgpg_error-1.13.recipe
new file mode 100644
index 000000000..5caa5ef19
--- /dev/null
+++ b/dev-libs/libgpg_error/libgpg_error-1.13.recipe
@@ -0,0 +1,63 @@
+SUMMARY="A library that defines common error values"
+DESCRIPTION="
+This is a library that defines common error values for all GnuPG components. \
+Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, DirMngr, \
+Pinentry, SmartCard Daemon and more.
+"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="2003-2013 g10 Code GmbH"
+HOMEPAGE="http://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$portVersion.tar.bz2"
+CHECKSUM_SHA256="f8aba9038d8a46cefe6a6c4a7e4527144c029eb4e3ca1ed27011b962102c9b0a"
+REVISION="1"
+ARCHITECTURES="x86"
+
+PROVIDES="
+	libgpg_error = $portVersion compat >= 1
+	lib:libgpg_error = 0.11.0 compat >= 0
+	cmd:gpg_error = $portVersion compat >= 1
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:make
+	cmd:gcc
+	"
+
+SOURCE_DIR="libgpg-error-$portVersion"
+
+PATCHES="libgpg_error-$portVersion.patchset"
+
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libgpg-error
+
+	packageEntries devel \
+		$developDir $binDir/gpg-error-config
+}
+
+PROVIDES_devel="
+	libgpg_error_devel = $portVersion compat >= 1
+	cmd:gpg_error_config = $portVersion compat >= 1
+	devel:libgpg_error = 0.11.0 compat >= 0
+	"
+
+REQUIRES_devel="
+	libgpg_error == $portVersion
+	"
diff --git a/dev-libs/libgpg_error/patches/libgpg_error-1.13.patchset b/dev-libs/libgpg_error/patches/libgpg_error-1.13.patchset
new file mode 100644
index 000000000..7b53cb2b4
--- /dev/null
+++ b/dev-libs/libgpg_error/patches/libgpg_error-1.13.patchset
@@ -0,0 +1,22 @@
+From 704f5695c327d67f550795e82004889717cf6ab9 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 5 Aug 2014 16:25:46 +0000
+Subject: haiku patch
+
+
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..93cfef2 100644
+--- a/src/mkerrcodes2.awk
++++ b/src/mkerrcodes2.awk
+@@ -81,7 +81,7 @@ BEGIN {
+ /^#/ { next; }
+ 
+ header {
+-  if ($1 ~ /^[0123456789]+$/)
++  if ($1 ~ /^-?[0123456789]+$/)
+     {
+       print "static const int err_code_from_index[] = {";
+       header = 0;
+-- 
+1.8.3.4
+