--- a/components/mutt/mutt.p5m	Thu Apr 11 10:50:53 2013 -0700
+++ b/components/mutt/mutt.p5m	Thu Apr 11 10:53:26 2013 -0700
@@ -34,30 +34,27 @@
 <transform file path=etc/mutt/Muttrc$ -> default preserve renamenew>
 <transform file path=etc/mutt/mime.types$ -> default mode 0644>
 <transform file path=etc/mutt/mime.types$ -> default preserve renamenew>
-
 set name=pkg.fmri value=pkg:/mail/mutt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Mutt E-Mail Client"
-set name=pkg.description value="Mutt is a small but very powerful text-based mail client for Unix operating systems."
+set name=pkg.description \
+    value="Mutt is a small but very powerful text-based mail client for Unix operating systems."
 set name=com.oracle.info.description value="the Mutt email client"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+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/2008/135
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/135
-
-license mutt.license license=GPLv2
-
 file path=etc/mutt/Muttrc
 file path=etc/mutt/Muttrc.dist
 file path=etc/mutt/mime.types
 file path=etc/mutt/mime.types.dist
-file path=usr/bin/flea
-file path=usr/bin/mutt
-file path=usr/bin/muttbug
-file path=usr/bin/pgpewrap
-file path=usr/bin/pgpring
-file path=usr/bin/smime_keys
+file usr/bin/$(MACH64)/flea path=usr/bin/flea
+file usr/bin/$(MACH64)/mutt path=usr/bin/mutt
+file usr/bin/$(MACH64)/muttbug path=usr/bin/muttbug
+file usr/bin/$(MACH64)/pgpewrap path=usr/bin/pgpewrap
+file usr/bin/$(MACH64)/pgpring path=usr/bin/pgpring
+file usr/bin/$(MACH64)/smime_keys path=usr/bin/smime_keys
 file path=usr/share/doc/mutt/COPYRIGHT
 file path=usr/share/doc/mutt/ChangeLog
 file path=usr/share/doc/mutt/GPL
@@ -151,9 +148,10 @@
 file path=usr/share/man/man1/flea.1
 file path=usr/share/man/man1/mutt.1
 file path=usr/share/man/man1/muttbug.1
+file pgpewrap.1 path=usr/share/man/man1/pgpewrap.1
+file pgpring.1 path=usr/share/man/man1/pgpring.1
 file path=usr/share/man/man1/smime_keys.1
 file path=usr/share/man/man5/mbox.5
 file path=usr/share/man/man5/mmdf.5
 file path=usr/share/man/man5/muttrc.5
-file pgpewrap.1 path=usr/share/man/man1/pgpewrap.1
-file pgpring.1 path=usr/share/man/man1/pgpring.1
+license mutt.license license=GPLv2