--- a/components/gnupg/gnupg.p5m	Wed Jun 22 06:49:27 2016 -0700
+++ b/components/gnupg/gnupg.p5m	Tue Jun 28 09:11:29 2016 -0700
@@ -22,6 +22,7 @@
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/share/gnupg/help\.([^/]+)(\..+){0,1}(/.+){0,1}\.txt$ -> default facet.locale.%<1> true>
+<include gnupg.p5m.link_gpg_to_gpg2>
 set name=pkg.fmri \
     value=pkg:/crypto/gnupg@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Privacy Guard"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnupg/gnupg.p5m.link_gpg_to_gpg2	Tue Jun 28 09:11:29 2016 -0700
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# Link 'gpg' with 'gpg2' to workaround GnuPG tools directly executing
+# gpg from the source code. gpg2 also presents itself as a gpg command
+# in the help messages.
+link path=usr/bin/gpg target=gpg2
+link path=usr/share/man/man1/gpg.1 target=gpg2.1