diff --git a/mod/dirfind.php b/mod/dirfind.php
index b0d578a3c6..488e10fa16 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,6 +1,7 @@
 <?php
 require_once('include/contact_widgets.php');
 require_once('include/socgraph.php');
+require_once('include/Contact.php');
 
 function dirfind_init(&$a) {
 
@@ -113,6 +114,8 @@ function dirfind_content(&$a, $prefix = "") {
 
 		if(count($j->results)) {
 
+			$id = 0;
+
 			$tpl = get_markup_template('match.tpl');
 			foreach($j->results as $jj) {
 
@@ -120,9 +123,16 @@ function dirfind_content(&$a, $prefix = "") {
 				if ($jj->cid > 0) {
 					$connlnk = "";
 					$conntxt = "";
+					$contact = q("SELECT * FROM `contact` WHERE `id` = %d",
+							intval($jj->cid));
+					if ($contact)
+						$photo_menu = contact_photo_menu($contact[0]);
+					else
+						$photo_menu = array();
 				} else {
 					$connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
 					$conntxt = t('Connect');
+					$photo_menu = array(array(t("Connect/Follow"), $connlnk));
 				}
 
 				$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
@@ -134,6 +144,8 @@ function dirfind_content(&$a, $prefix = "") {
 					'$tags' => $jj->tags,
 					'$conntxt' => $conntxt,
 					'$connlnk' => $connlnk,
+					'$photo_menu' => $photo_menu,
+					'$id' => ++$id,
 				));
 			}
 		}
diff --git a/view/templates/match.tpl b/view/templates/match.tpl
index 32f046e6aa..3ebabf1854 100644
--- a/view/templates/match.tpl
+++ b/view/templates/match.tpl
@@ -1,9 +1,25 @@
 
 <div class="profile-match-wrapper">
-	<div class="profile-match-photo">
+	<div class="profile-match-photo" id="contact-entry-photo-{{$id}}"
+                onmouseover="if (typeof t{{$id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$id}}')" 
+                onmouseout="t{{$id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$id}}\'); closeMenu(\'contact-photo-menu-{{$id}}\');',200)" >
 		<a href="{{$url}}">
 			<img width="80" height="80" src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
 		</a>
+		{{if $photo_menu}}
+                        <span onclick="openClose('contact-photo-menu-{{$id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$id}}">menu</span>
+                        <div class="contact-photo-menu" id="contact-photo-menu-{{$id}}">
+                                <ul>
+                                        {{foreach $photo_menu as $k=>$c}}
+                                        {{if $c.2}}
+                                        <li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                        {{else}}
+                                        <li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
+                                        {{/if}}
+                                        {{/foreach}}
+                                </ul>
+                        </div>
+                        {{/if}}
 	</div>
 	<div class="profile-match-break"></div>
 	<div class="profile-match-name">