--- a/pkg/manifests/x11-server-xvnc.mf	Thu Oct 21 14:40:25 2010 -0700
+++ b/pkg/manifests/x11-server-xvnc.mf	Thu Oct 21 21:27:50 2010 -0700
@@ -32,6 +32,8 @@
 dir path=usr/X11
 dir path=usr/X11/bin
 dir path=usr/bin
+$(i386_ONLY)dir path=usr/bin/$(ARCH32)
+$(i386_ONLY)dir path=usr/bin/$(ARCH64)
 dir path=usr/lib/mdb
 dir path=usr/lib/mdb/proc
 $(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=bin
@@ -42,11 +44,21 @@
 dir path=usr/share/vnc
 dir path=usr/share/vnc/classes
 file path=lib/svc/manifest/application/x11/xvnc-inetd.xml
-file path=usr/bin/Xvnc group=root mode=2555
-file path=usr/bin/vncconfig
-file path=usr/bin/vncpasswd
-file path=usr/bin/vncserver
-file path=usr/bin/x0vncserver
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/Xvnc group=root mode=2555
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/vncconfig
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/vncpasswd
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/vncserver
+$(i386_ONLY)file path=usr/bin/$(ARCH32)/x0vncserver
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/Xvnc group=root mode=2555
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/vncconfig
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/vncpasswd
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/vncserver
+$(i386_ONLY)file path=usr/bin/$(ARCH64)/x0vncserver
+$(sparc_ONLY)file path=usr/bin/Xvnc group=root mode=2555
+$(sparc_ONLY)file path=usr/bin/vncconfig
+$(sparc_ONLY)file path=usr/bin/vncpasswd
+$(sparc_ONLY)file path=usr/bin/vncserver
+$(sparc_ONLY)file path=usr/bin/x0vncserver
 file path=usr/share/man/man1/Xvnc.1
 file path=usr/share/man/man1/vncconfig.1
 file path=usr/share/man/man1/vncpasswd.1
@@ -61,8 +73,14 @@
 legacy pkg=SUNWxvnc \
     desc="X Window System server based on X.Org Foundation open source release and TigerVNC open source release that displays over RFB protocol to a VNC client" \
     name="X11/VNC server"
+$(i386_ONLY)hardlink path=usr/bin/Xvnc target=../lib/isaexec
+$(i386_ONLY)hardlink path=usr/bin/vncconfig target=../lib/isaexec
+$(i386_ONLY)hardlink path=usr/bin/vncpasswd target=../lib/isaexec
+$(i386_ONLY)hardlink path=usr/bin/vncserver target=../lib/isaexec
+$(i386_ONLY)hardlink path=usr/bin/x0vncserver target=../lib/isaexec
 link path=usr/X11/bin/Xvnc target=../../bin/Xvnc
 link path=usr/lib/mdb/proc/Xvnc.so target=Xserver.so
+link path=usr/lib/mdb/proc/$(ARCH64)/Xvnc.so target=Xserver.so
 # /usr/bin/vncserver is a perl script, but pkgdep doesn't pick up the
 # dependency automatically
 depend fmri=pkg:/runtime/perl-584 type=require