diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
new file mode 100644
index 00000000000..e3634cd237b
--- /dev/null
+++ b/security/gnupg/Makefile
@@ -0,0 +1,25 @@
+# $OpenBSD: Makefile,v 1.1.1.1 1999/04/23 03:16:05 brad Exp $
+
+DISTNAME=	gnupg-0.9.5
+CATEGORIES=	security
+MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/
+
+MAINTAINER=	markus.friedl@informatik.uni-erlangen.de
+
+SEPARATE_BUILD=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GNUPGDOCDIR=	${PREFIX}/share/doc/gnupg
+GNUPGDOCFILES=	README AUTHORS COPYING THANKS TODO BUGS \
+		doc/DETAILS doc/FAQ doc/OpenPGP doc/HACKING
+
+post-install:
+	${MKDIR} ${GNUPGDOCDIR}
+	@set -e; for f in ${GNUPGDOCFILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${f} ${GNUPGDOCDIR}/; \
+	done
+
+.include <bsd.port.mk>
diff --git a/security/gnupg/files/md5 b/security/gnupg/files/md5
new file mode 100644
index 00000000000..2efde75be03
--- /dev/null
+++ b/security/gnupg/files/md5
@@ -0,0 +1,3 @@
+SHA1 (gnupg-0.9.5.tar.gz) = 42bd553b59e5467f738ba4e7966b7fb9f8e2e452
+RMD160 (gnupg-0.9.5.tar.gz) = 51f0788da5cde36e08fdc89d15544b8f13db0089
+MD5 (gnupg-0.9.5.tar.gz) = 4dfbebbf3d1bcf18fbaa6446918432fe
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
new file mode 100644
index 00000000000..7140e4e75a9
--- /dev/null
+++ b/security/gnupg/patches/patch-aa
@@ -0,0 +1,20 @@
+--- configure.orig	Sat Mar 20 10:34:01 1999
++++ configure	Wed Mar 31 14:52:19 1999
+@@ -1583,7 +1583,7 @@
+ aix*)
+   ac_symcode='[BCDTU]'
+   ;;
+-sunos* | cygwin32* | mingw32*)
++openbsd* | sunos* | cygwin32* | mingw32*)
+   ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
+   ac_symxfrm='_\1 \1'
+   ;;
+@@ -1840,7 +1840,7 @@
+             CFLAGS_RDYNAMIC="-Wl,-dy"
+             ;;
+ 
+-          freebsd2* | osf4* )
++          openbsd*| freebsd2* | osf4* )
+             CFLAGS_RDYNAMIC=""
+             ;;
+           * )
diff --git a/security/gnupg/pkg/COMMENT b/security/gnupg/pkg/COMMENT
new file mode 100644
index 00000000000..1327b04f72c
--- /dev/null
+++ b/security/gnupg/pkg/COMMENT
@@ -0,0 +1 @@
+GNU privacy guard - a free PGP replacement.
diff --git a/security/gnupg/pkg/DESCR b/security/gnupg/pkg/DESCR
new file mode 100644
index 00000000000..9bd7055b7a2
--- /dev/null
+++ b/security/gnupg/pkg/DESCR
@@ -0,0 +1,5 @@
+GnuPG is a complete and free replacement for PGP. Because it does
+not use IDEA or RSA it can be used without any restrictions. GnuPG
+is nearly in compliance with RFC2440 (OpenPGP).
+
+IDEA and RSA plugins are available from ftp://ftp.gnupg.org/
diff --git a/security/gnupg/pkg/PLIST b/security/gnupg/pkg/PLIST
new file mode 100644
index 00000000000..f8b3bd0faa6
--- /dev/null
+++ b/security/gnupg/pkg/PLIST
@@ -0,0 +1,22 @@
+bin/gpg
+bin/gpgm
+lib/gnupg/rndunix
+lib/gnupg/rndegd
+lib/gnupg/tiger
+lib/gnupg/twofish
+man/man1/gpg.1
+man/man1/gpgm.1
+share/doc/gnupg/README
+share/doc/gnupg/AUTHORS
+share/doc/gnupg/COPYING
+share/doc/gnupg/THANKS
+share/doc/gnupg/TODO
+share/doc/gnupg/BUGS
+share/doc/gnupg/DETAILS
+share/doc/gnupg/FAQ
+share/doc/gnupg/OpenPGP
+share/doc/gnupg/HACKING
+share/gnupg/options.skel
+@dirrm lib/gnupg
+@dirrm share/doc/gnupg
+@dirrm share/gnupg