--- a/components/tcl/expect/expect.p5m	Fri May 25 17:10:36 2012 -0700
+++ b/components/tcl/expect/expect.p5m	Tue May 29 10:27:59 2012 -0700
@@ -18,9 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+<transform file path=usr/demo/expect/.+ ->default mode 0555>
+<transform file path=usr/demo/expect/man/.+ -> set mode 0444>
+
 set name=pkg.fmri \
     value=pkg:/shell/expect@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description \
@@ -36,18 +39,23 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
+dir path=usr/bin/$(MACH32)
+dir path=usr/bin/$(MACH64)
 dir path=usr/demo
 dir path=usr/demo/expect
 dir path=usr/demo/expect/man
 dir path=usr/demo/expect/man/man1
 dir path=usr/include
 dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+dir path=usr/lib/$(MACH64)/expect$(COMPONENT_VERSION)
 dir path=usr/lib/expect$(COMPONENT_VERSION)
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man3
-file path=usr/bin/expect
+file path=usr/bin/$(MACH64)/expect
+file usr/bin/expect path=usr/bin/$(MACH32)/expect
 file path=usr/demo/expect/autoexpect
 file path=usr/demo/expect/autopasswd
 file path=usr/demo/expect/cryptdir
@@ -84,9 +92,11 @@
 file path=usr/include/expect_comm.h
 file path=usr/include/expect_tcl.h
 file path=usr/include/tcldbg.h
+file path=usr/lib/$(MACH64)/expect$(COMPONENT_VERSION)/libexpect$(COMPONENT_VERSION).so
+file path=usr/lib/$(MACH64)/expect$(COMPONENT_VERSION)/pkgIndex.tcl
 file path=usr/lib/expect$(COMPONENT_VERSION)/libexpect$(COMPONENT_VERSION).so
 file path=usr/lib/expect$(COMPONENT_VERSION)/pkgIndex.tcl
 file path=usr/share/man/man1/expect.1
 file path=usr/share/man/man3/libexpect.3
+link path=usr/bin/expect target=$(MACH64)/expect
 license expect.license license="BSD-like, GPLv2"
-