--- a/components/gnupg/gnupg.p5m	Tue Feb 25 02:29:07 2014 -0800
+++ b/components/gnupg/gnupg.p5m	Tue Feb 25 05:35:54 2014 -0800
@@ -18,21 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-<transform dir path=usr/share/gnupg$ -> default facet.locale true>
 <transform file path=usr/share/gnupg/help\.([^/]+)(\..+){0,1}(/.+){0,1}\.txt$ -> default facet.locale.%<\1> true>
-
-set name=pkg.fmri value=pkg:/crypto/gnupg@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/crypto/gnupg@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Privacy Guard"
-set name=pkg.description value="A complete and free implementation of the OpenPGP Standard as defined by RFC4880."
+set name=pkg.description \
+    value="A complete and free implementation of the OpenPGP Standard as defined by RFC4880."
 set name=com.oracle.info.description value="GNU Privacy Guard"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/397
+set name=org.opensolaris.arc-caseid value=PSARC/2009/397 value=PSARC/2014/012
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
@@ -205,6 +205,7 @@
 file path=usr/share/locale/sk/LC_MESSAGES/gnupg2.mo
 file path=usr/share/locale/sv/LC_MESSAGES/gnupg2.mo
 file path=usr/share/locale/tr/LC_MESSAGES/gnupg2.mo
+file path=usr/share/locale/uk/LC_MESSAGES/gnupg2.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
 file path=usr/share/man/man1/gpg-agent.1
@@ -225,4 +226,4 @@
 #
 license gnupg.license license="GPLv3, LGPLv3"
 #
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/pinentry type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/pinentry