diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index cec7db06dc2..1855d30a2aa 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.5 1999/06/28 20:05:41 brad Exp $
+# $OpenBSD: Makefile,v 1.6 1999/07/25 23:33:41 brad Exp $
 
-DISTNAME=	gnupg-0.9.8
+DISTNAME=	gnupg-0.9.9
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/ \
 		ftp://ftp.progsoc.uts.edu.au/pub/gnupg/ \
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/ \
 
 MAINTAINER=	markus.friedl@informatik.uni-erlangen.de
 
+USE_GMAKE=	yes
 SEPARATE_BUILD=	concurrent
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls
@@ -26,7 +27,7 @@ GNUPGDOCFILES=	README AUTHORS COPYING THANKS TODO BUGS \
 		doc/DETAILS doc/FAQ doc/OpenPGP doc/HACKING
 
 post-install:
-	${MKDIR} ${GNUPGDOCDIR}
+	@${MKDIR} ${GNUPGDOCDIR}
 	@set -e; for f in ${GNUPGDOCFILES}; do \
 		${INSTALL_DATA} ${WRKSRC}/$${f} ${GNUPGDOCDIR}/; \
 	done
diff --git a/security/gnupg/files/md5 b/security/gnupg/files/md5
index 2b900b6959b..82a034ccbfa 100644
--- a/security/gnupg/files/md5
+++ b/security/gnupg/files/md5
@@ -1,3 +1,3 @@
-MD5 (gnupg-0.9.8.tar.gz) = fd9351b26b3189c1d577f0970f9dcadc
-RMD160 (gnupg-0.9.8.tar.gz) = 55ffce61d50a332fa5af2904dda11e153fb1d6dc
-SHA1 (gnupg-0.9.8.tar.gz) = c6f6fe949f652b4946dda4d21695a8d08679be6e
+MD5 (gnupg-0.9.9.tar.gz) = 5f9882ca5019badf2dfee1ecdce5253f
+RMD160 (gnupg-0.9.9.tar.gz) = 79a88a71bf5bbb106b7fac9c2233455e8b426d44
+SHA1 (gnupg-0.9.9.tar.gz) = ad462c79c045ba746e25ff08a4fa81002fa950d4
diff --git a/security/gnupg/patches/patch-aa b/security/gnupg/patches/patch-aa
index 57748543e8c..e90e9968a07 100644
--- a/security/gnupg/patches/patch-aa
+++ b/security/gnupg/patches/patch-aa
@@ -1,14 +1,14 @@
---- g10/Makefile.in.orig	Mon May 24 16:19:19 1999
-+++ g10/Makefile.in	Mon May 24 16:20:00 1999
-@@ -577,8 +577,9 @@
- 	$(INSTALL_DATA) $(srcdir)/options.skel $(pkgdatadir)/options.skel
+--- g10/Makefile.in.orig	Sun Jul 25 18:55:09 1999
++++ g10/Makefile.in	Sun Jul 25 18:56:43 1999
+@@ -611,8 +611,9 @@
  	@set -e;\
- 	 if test -f $(bindir)/gpgm ; then \
--	   rm $(bindir)/gpgm ; ln -s gpg $(bindir)/gpgm ; \
+ 	 if test -f $(DESTDIR)$(bindir)/gpgm ; then \
+ 	   echo "removing obsolete gpgm binary" ;   \
+-	   rm $(DESTDIR)$(bindir)/gpgm ;	    \
 -	 fi
 +	   rm $(bindir)/gpgm ; \
 +	 fi; \
-+	 ln -s gpg $(bindir)/gpgm
++	ln -s gpg $(bindir)/gpgm
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/security/gnupg/patches/patch-aclocal b/security/gnupg/patches/patch-aclocal
new file mode 100644
index 00000000000..183352524a0
--- /dev/null
+++ b/security/gnupg/patches/patch-aclocal
@@ -0,0 +1,11 @@
+--- aclocal.m4-	Mon Jul 26 00:10:12 1999
++++ aclocal.m4	Mon Jul 26 00:10:28 1999
+@@ -578,7 +578,7 @@
+ esac
+ 
+ if test "$tmp_do_check" = "yes"; then
+-ac_cv_sys_symbol_underscore=""
++unset ac_cv_sys_symbol_underscore
+ AC_REQUIRE([GNUPG_PROG_NM])dnl
+ AC_REQUIRE([GNUPG_SYS_NM_PARSE])dnl
+ AC_MSG_CHECKING([for _ prefix in compiled symbols])
diff --git a/security/gnupg/patches/patch-configure b/security/gnupg/patches/patch-configure
new file mode 100644
index 00000000000..34c07bd47ac
--- /dev/null
+++ b/security/gnupg/patches/patch-configure
@@ -0,0 +1,11 @@
+--- configure-	Mon Jul 26 00:10:07 1999
++++ configure	Mon Jul 26 00:10:57 1999
+@@ -2362,7 +2362,7 @@
+ esac
+ 
+ if test "$tmp_do_check" = "yes"; then
+-ac_cv_sys_symbol_underscore=""
++unset ac_cv_sys_symbol_underscore
+ echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
+ echo "configure:2368: checking for _ prefix in compiled symbols" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then