--- a/pkg/manifests/x11-server-xvnc.p5m	Thu Feb 11 13:32:25 2016 -0800
+++ b/pkg/manifests/x11-server-xvnc.p5m	Thu Feb 11 22:47:05 2016 -0800
@@ -24,7 +24,6 @@
 set name=pkg.description \
     value="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"
 file path=lib/svc/manifest/application/x11/xvnc-inetd.xml
-file path=usr/lib/vnclock mode=0555
 link path=usr/X11/bin/Xvnc target=../../bin/Xvnc
 $(i386_ONLY)link path=usr/bin/$(ARCH64)/Xvnc target=../Xvnc
 file path=usr/bin/Xvnc group=root mode=2555
@@ -33,6 +32,7 @@
 file path=usr/bin/vncserver
 file path=usr/bin/x0vncserver
 link path=usr/lib/mdb/proc/$(ARCH64)/Xvnc.so target=Xserver.so
+file path=usr/lib/vnclock mode=0555
 file path=usr/share/man/man1/Xvnc.1
 file path=usr/share/man/man1/vncconfig.1
 file path=usr/share/man/man1/vncpasswd.1
@@ -56,6 +56,9 @@
 depend type=group fmri=pkg:/desktop/window-manager/twm
 depend type=group fmri=pkg:/terminal/xterm
 
+# Xvnc depends on xscreensaver
+depend type=require fmri=pkg:/desktop/xscreensaver
+
 # vncserver script requires xdpyinfo
 depend type=require fmri=pkg:/x11/diagnostic/x11-info-clients
 
@@ -66,6 +69,3 @@
 # vncserver script requires xauth & xrdb programs
 depend type=require fmri=pkg:/x11/session/xauth
 depend type=require fmri=pkg:/x11/x11-server-utilities
-
-# Xvnc depends on xscreensaver
-depend type=require fmri=pkg:/desktop/xscreensaver