diff --git a/mod/match.php b/mod/match.php
index 12138a26c7..2d6456b54b 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -26,7 +26,7 @@ function match_content(&$a) {
 		$params['s'] = $tags;
 		if($a->pager['page'] != 1)
 			$params['p'] = $a->pager['page'];
-
+			
 		$x = post_url('http://dir.friendika.com/msearch', $params);
 
 		$j = json_decode($x);
diff --git a/mod/msearch.php b/mod/msearch.php
new file mode 100644
index 0000000000..dc94962954
--- /dev/null
+++ b/mod/msearch.php
@@ -0,0 +1,41 @@
+<?php
+
+function msearch_post(&$a) {
+
+	$perpage = (($_POST['n']) ? $_POST['n'] : 80);
+	$page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
+	$startrec = (($page+1) * $perpage) - $perpage;
+
+	$search = $_POST['s'];
+	if(! strlen($search))
+		killme();
+
+	$r = q("SELECT COUNT(*) AS `total` FROM `profile` WHERE `is-default` = 1 AND `hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ",
+		dbesc($search)
+	);
+	if(count($r))
+		$total = $r[0]['total'];
+
+	$r = q("SELECT `username`, `nickname`, `user`.`uid` FROM `user` LEFT JOIN `profile` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') LIMIT %d , %d ",
+		dbesc($search),
+		intval($startrec),
+		intval($perpage)
+	);
+
+	$results = array();
+	if(count($r)) {
+		foreach($r as $rr)
+			$results[] = array(
+				'name' => $rr['name'], 
+				'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'], 
+				'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . 'jpg'
+			);
+	}
+
+	$output = array('total' => $total, 'items_page' => $perpage, 'page' => $page + 1, 'results' => $results);
+
+	echo json_encode($output);
+
+	killme();
+
+}
\ No newline at end of file