--- a/components/ksh93/ksh93.p5m	Wed Nov 25 13:34:08 2015 -0800
+++ b/components/ksh93/ksh93.p5m	Thu Nov 26 02:23:48 2015 -0800
@@ -47,16 +47,6 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=etc/ksh.kshrc group=sys original_name=SUNWcs:etc/ksh.kshrc \
     preserve=renameold
-file $(MACH32)/bin/ksh path=usr/bin/$(MACH32)/ksh mode=0555
-hardlink path=usr/bin/$(MACH32)/ksh93 target=ksh
-hardlink path=usr/bin/$(MACH32)/rksh target=ksh
-hardlink path=usr/bin/$(MACH32)/rksh93 target=ksh
-file $(MACH32)/bin/shcomp path=usr/bin/$(MACH32)/shcomp mode=0555
-file $(MACH64)/bin/ksh path=usr/bin/$(MACH64)/ksh mode=0555
-hardlink path=usr/bin/$(MACH64)/ksh93 target=ksh
-hardlink path=usr/bin/$(MACH64)/rksh target=ksh
-hardlink path=usr/bin/$(MACH64)/rksh93 target=ksh
-file $(MACH64)/bin/shcomp path=usr/bin/$(MACH64)/shcomp mode=0555
 file $(MACH64)/bin/alias path=usr/bin/alias mode=0555
 hardlink path=usr/bin/bg target=alias
 hardlink path=usr/bin/cd target=alias
@@ -68,18 +58,18 @@
 hardlink path=usr/bin/jobs target=alias
 link path=usr/bin/jsh target=ksh93
 hardlink path=usr/bin/kill target=alias
-hardlink path=usr/bin/ksh target=$(MACH64)/ksh
-hardlink path=usr/bin/ksh93 target=$(MACH64)/ksh
+file $(MACH64)/bin/ksh path=usr/bin/ksh mode=0555
+hardlink path=usr/bin/ksh93 target=ksh
 hardlink path=usr/bin/pfksh target=pfexec
 hardlink path=usr/bin/pfksh93 target=pfexec
 hardlink path=usr/bin/pfrksh target=pfexec
 hardlink path=usr/bin/pfrksh93 target=pfexec
 hardlink path=usr/bin/print target=alias
 hardlink path=usr/bin/read target=alias
-hardlink path=usr/bin/rksh target=$(MACH64)/ksh
-hardlink path=usr/bin/rksh93 target=$(MACH64)/ksh
-link path=usr/bin/sh target=$(MACH64)/ksh93
-hardlink path=usr/bin/shcomp target=$(MACH64)/shcomp
+hardlink path=usr/bin/rksh target=ksh
+hardlink path=usr/bin/rksh93 target=ksh
+hardlink path=usr/bin/sh target=ksh
+file $(MACH64)/bin/shcomp path=usr/bin/shcomp mode=0555
 hardlink path=usr/bin/test target=alias
 hardlink path=usr/bin/type target=alias
 hardlink path=usr/bin/ulimit target=alias
@@ -88,7 +78,7 @@
 hardlink path=usr/bin/wait target=alias
 link path=usr/lib/rsh target=../bin/ksh93
 link path=usr/sbin/jsh target=../bin/ksh93
-link path=usr/sbin/sh target=../bin/$(MACH64)/ksh93
+link path=usr/sbin/sh target=../bin/ksh93
 file src/cmd/ksh93/COMPATIBILITY path=usr/share/doc/ksh/COMPATIBILITY
 file src/cmd/ksh93/OBSOLETE path=usr/share/doc/ksh/OBSOLETE
 file src/cmd/ksh93/TYPES path=usr/share/doc/ksh/TYPES
@@ -110,7 +100,7 @@
 file ksh93.1.zh_CN.UTF-8 path=usr/share/man/zh_CN.UTF-8/man1/ksh93.1
 file rksh.1.zh_CN.UTF-8 path=usr/share/man/zh_CN.UTF-8/man1/rksh.1
 file shcomp.1.zh_CN.UTF-8 path=usr/share/man/zh_CN.UTF-8/man1/shcomp.1
-license ksh93.license license=CPL
+license ksh93.license license=EPL1.0
 # Ensure that we upgrade the old package to the version where it's
 # renamed.
 depend type=optional fmri=pkg:/shell/[email protected]