--- a/components/emacs/gnu-emacs-x11.p5m	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/gnu-emacs-x11.p5m	Tue Aug 18 12:04:09 2015 -0600
@@ -34,6 +34,10 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
+# Mediated symlink for usr/bin/emacs, to run "best" version
+link path=usr/bin/emacs target=emacs-x mediator=emacs \
+    mediator-implementation=emacs-x mediator-priority=vendor
+
 
 file path=usr/bin/emacs-x
 hardlink path=usr/bin/emacs-x-$(COMPONENT_VERSION) target=emacs-x
@@ -45,5 +49,5 @@
 # pkgdepend find that relationship without hardwiring an fmri, specify
 # a dependency on a file known to always be present in the core package,
 # and allow pkgdepend to generate the fmri.
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacs \
-    pkg.debug.reason=usr/bin/emacs-gtk
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacsclient \
+    pkg.debug.reason=usr/bin/emacs-x