diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep b/dev-libs/libgcrypt/libgcrypt-1.4.5.bep
new file mode 100644
index 000000000..acd8d7410
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.4.5.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="libgcrypt" 
+HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" 
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.5.tar.gz"
+REVISION="1"
+STATUS_HAIKU="untested"
+DEPEND="dev-libs/libgpg-error"
+BUILD {
+	cd libgcrypt-1.4.5
+	libtoolize --force --copy --install
+	autogen.sh
+	./configure --prefix=/boot/common
+	make
+}
+
+INSTALL {
+	cd libgcrypt-1.4.5
+	make install
+}
diff --git a/dev-libs/libgcrypt/libgcrypt.OptionalPackageDescription b/dev-libs/libgcrypt/libgcrypt.OptionalPackageDescription
new file mode 100644
index 000000000..3de748834
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt.OptionalPackageDescription
@@ -0,0 +1,5 @@
+Package:	libgcrypt
+Version:		1.4.5
+Copyright:	2000-2010 Free Software Foundation, Inc.
+License:		GNU LGPL v3
+URL:			http://directory.fsf.org/project/libgcrypt/
diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.4.patch b/dev-libs/libgcrypt/patches/libgcrypt-1.4.4.patch
similarity index 100%
rename from dev-libs/libgcrypt/libgcrypt-1.4.4.patch
rename to dev-libs/libgcrypt/patches/libgcrypt-1.4.4.patch
diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.4.5.patch b/dev-libs/libgcrypt/patches/libgcrypt-1.4.5.patch
new file mode 100644
index 000000000..2ed4c33d7
--- /dev/null
+++ b/dev-libs/libgcrypt/patches/libgcrypt-1.4.5.patch
@@ -0,0 +1,20 @@
+diff -Naur libgcrypt-1.4.5/configure.ac libgcrypt-1.4.5-haiku/configure.ac
+--- libgcrypt-1.4.5/configure.ac	2009-12-11 15:43:15.025165824 +0000
++++ libgcrypt-1.4.5-haiku/configure.ac	2010-04-27 00:48:26.807141376 +0000
+@@ -574,12 +574,16 @@
+ 	[AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
+ AC_SEARCH_LIBS(setsockopt, [nsl])
+ 
++# Haiku has everything in -lnetwork
++AC_SEARCH_LIBS(socket, [network]) 
++
+ ##################################
+ #### Checks for header files. ####
+ ##################################
+ 
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(unistd.h sys/select.h)
++AC_CHECK_HEADERS(sys/select.h sys/time.h)
+ 
+ ##########################################
+ #### Checks for typedefs, structures, ####
diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.bep b/dev-libs/libgpg-error/libgpg-error-1.7.bep
new file mode 100644
index 000000000..48ba5d391
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.7.bep
@@ -0,0 +1,18 @@
+DESCRIPTION="libgpg-error"
+HOMEPAGE="http://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.7.tar.bz2"
+REVISION="1"
+STATUS_HAIKU="untested"
+DEPEND=""
+CHECKSUM_MD5="62c0d09d1e76c5b6da8fff92314c4665"
+BUILD {
+	cd libgpg-error-1.7
+	autoreconf -vfi -Im4
+	./configure --prefix=/boot/common
+	make
+}
+
+INSTALL {
+	cd libgpg-error-1.7
+	make install
+}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.patch b/dev-libs/libgpg-error/patches/libgpg-error-1.7.patch
similarity index 100%
rename from dev-libs/libgpg-error/libgpg-error-1.7.patch
rename to dev-libs/libgpg-error/patches/libgpg-error-1.7.patch