--- a/components/gpatch/patch.p5m	Thu Sep 29 13:43:36 2016 -0700
+++ b/components/gpatch/patch.p5m	Thu Sep 29 15:07:39 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -32,9 +32,9 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/1999/555 value=PSARC/2014/324
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/bin/gpatch target=../gnu/bin/patch facet.compat.gnulinks=true
-link path=usr/bin/patch target=../gnu/bin/patch
-file usr/bin/patch path=usr/gnu/bin/patch
+link path=usr/bin/gpatch target=../bin/patch facet.compat.gnulinks=true
+file path=usr/bin/patch
+link path=usr/gnu/bin/patch target=../../bin/patch
 file usr/share/man/man1/patch.1 path=usr/gnu/share/man/man1/patch.1
 link path=usr/share/man/man1/gpatch.1 \
     target=../../../gnu/share/man/man1/patch.1 facet.compat.gnulinks=all