diff --git a/app-crypt/gnupg/gnupg-1.4.20.recipe b/app-crypt/gnupg/gnupg-1.4.20.recipe
new file mode 100644
index 000000000..7e3852c3d
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.20.recipe
@@ -0,0 +1,70 @@
+SUMMARY="The GNU project's free implementation of the OpenPGP standard"
+DESCRIPTION="GnuPG is the GNU project's complete and free implementation of \
+the OpenPGP standard as defined by RFC4880 . GnuPG allows to encrypt and sign \
+your data and communication, features a versatile key management system as \
+well as access modules for all kinds of public key directories. GnuPG, also \
+known as GPG, is a command line tool with features for easy integration with \
+other applications."
+HOMEPAGE="https://www.gnupg.org/"
+COPYRIGHT="1998-2015 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
+CHECKSUM_SHA256="04988b1030fa28ddf961ca8ff6f0f8984e0cddcb1eb02859d5d8fe0fe237edcc"
+PATCHES="gnupg-$portVersion.patchset"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="gnupg = $portVersion
+	cmd:gpg = $portVersion compat >= 1.4
+	cmd:gpg_zip = $portVersion compat >= 1.4
+	cmd:gpgsplit = $portVersion compat >= 1.4
+	cmd:gpgv = $portVersion compat >= 1.4
+	"
+REQUIRES="
+	haiku
+	lib:libcurl
+	lib:libiconv
+	lib:libintl
+	lib:libreadline
+	lib:libusb_0.1
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	devel:libcurl
+	devel:libiconv
+	devel:libintl
+	devel:libreadline
+	devel:libusb_0.1
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:autoreconf
+	cmd:bison
+	cmd:find
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:msgfmt
+	cmd:perl
+	cmd:tar
+	"
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+	make check
+}
diff --git a/app-crypt/gnupg/patches/gnupg-1.4.20.patchset b/app-crypt/gnupg/patches/gnupg-1.4.20.patchset
new file mode 100644
index 000000000..6bf900582
--- /dev/null
+++ b/app-crypt/gnupg/patches/gnupg-1.4.20.patchset
@@ -0,0 +1,35 @@
+From: fbrosson <fbrosson@users.noreply.github.com>
+Date: Thu, 18 Feb 2016 22:55:30 +0000
+Subject: [PATCH] Fix detection of libnetwork
+
+diff -urp gnupg-1.4.20/configure.ac gnupg-1.4.20-haiku/configure.ac
+--- gnupg-1.4.20/configure.ac	2015-12-19 14:08:22.000000000 +0000
++++ gnupg-1.4.20-haiku/configure.ac
+@@ -686,10 +686,12 @@ dnl for ldap, for example. If ldap libs
+ dnl ELF runtime link paths), then link will fail and LDAP support won't
+ dnl be detected.
+ 
+-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname,
+-	[NETLIBS="-lnsl $NETLIBS"]))
+-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
+-	[NETLIBS="-lsocket $NETLIBS"]))
++_net_save_libs=$LIBS
++LIBS=""
++AC_SEARCH_LIBS(gethostbyname, nsl network)
++AC_SEARCH_LIBS(setsockopt, network socket)
++NETLIBS="$LIBS"
++LIBS="$_net_save_libs"
+ 
+ dnl Now try for the resolver functions so we can use DNS for SRV, PKA,
+ dnl and CERT.
+@@ -712,8 +714,8 @@ if test x"$use_dns_srv" = xyes || test x
+   _dns_save_libs=$LIBS
+   LIBS=""
+   # the double underscore thing is a glibc-ism?
+-  AC_SEARCH_LIBS(res_query,resolv bind socket,,
+-            AC_SEARCH_LIBS(__res_query,resolv bind socket,,have_resolver=no))
++  AC_SEARCH_LIBS(res_query,resolv network bind socket,,
++            AC_SEARCH_LIBS(__res_query,resolv network bind socket,,have_resolver=no))
+   AC_SEARCH_LIBS(dn_expand,resolv bind socket,,
+             AC_SEARCH_LIBS(__dn_expand,resolv bind socket,,have_resolver=no))
+   AC_SEARCH_LIBS(dn_skipname,resolv bind socket,,