diff --git a/bin/ec b/bin/ec
index 572b8ac..e3bd8c6 100755
--- a/bin/ec
+++ b/bin/ec
@@ -1,9 +1,19 @@
 #!/bin/bash
-echo "Display: $DISPLAY"
-if [ -z "$DISPLAY" ]; then
-  # echo "Searching for text Emacs"
-  emacsclient -a "" -t "$@"
-else
-  # echo "Searching for GUI Emacs"
-  emacsclient -n -a "" -c "$@"
+if [ "$PARENT_REPO" == "" ] ; then
+    PARENT_REPO=$(find-parent-repo)
+    if [ "$PARENT_REPO" == "" ] ; then
+        echo "No repo found, using unnamed/common daemon."
+    else
+        REPO_NAME=$(basename $PARENT_REPO)
+        if [ -n "$REPO_NAME" ] ; then
+            echo "Using Emacs daemon $REPO_NAME"
+            SOCKET_ARGS="-s $REPO_NAME"
+        fi
+    fi
+fi
+
+if [ -z "$DISPLAY" ]; then
+    emacsclient $SOCKET_ARGS -a "" -t "$@"
+else
+    emacsclient $SOCKET_ARGS -a "" -n -c "$@"
 fi