diff --git a/include/nav.php b/include/nav.php
index 3d27be13be..e1661644d1 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -26,7 +26,7 @@ function nav(&$a) {
 	$tpl = get_markup_template('nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
-        '$baseurl' => $a->get_baseurl(),
+		'$baseurl' => $a->get_baseurl(),
 		'$langselector' => lang_selector(),
 		'$sitelocation' => $nav_info['sitelocation'],
 		'$nav' => $nav_info['nav'],
@@ -118,6 +118,12 @@ function nav_info(&$a) {
 
 	$nav['search'] = array('search', t('Search'), "", t('Search site content'));
 
+	$nav['searchoption'] = array(
+					t("Full Text"),
+					t("Tags"),
+					t("Contacts"),
+					t("Forums"));
+
 	$gdirpath = 'directory';
 
 	if(strlen(get_config('system','singleuser'))) {
diff --git a/include/text.php b/include/text.php
index 4747a376fe..f3e44b3ebc 100644
--- a/include/text.php
+++ b/include/text.php
@@ -995,6 +995,11 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 		'$search_label' => t('Search'),
 		'$save_label' => t('Save'),
 		'$savedsearch' => feature_enabled(local_user(),'savedsearch'),
+		'$searchoption' => array(
+					t("Full Text"),
+					t("Tags"),
+					t("Contacts"),
+					t("Forums"))
 	));
 }}
 
diff --git a/mod/dirfind.php b/mod/dirfind.php
index e70dfe9680..3cee6c1330 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -14,13 +14,13 @@ function dirfind_init(&$a) {
 
 
 
-function dirfind_content(&$a) {
+function dirfind_content(&$a, $prefix = "") {
 
 	$community = false;
 
 	$local = get_config('system','poco_local_search');
 
-	$search = notags(trim($_REQUEST['search']));
+	$search = $prefix.notags(trim($_REQUEST['search']));
 
 	if(strpos($search,'@') === 0)
 		$search = substr($search,1);
diff --git a/mod/search.php b/mod/search.php
index a01984d244..d5e0dfb208 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,4 +1,8 @@
 <?php
+require_once("include/bbcode.php");
+require_once('include/security.php');
+require_once('include/conversation.php');
+require_once('mod/dirfind.php');
 
 function search_saved_searches() {
 
@@ -92,9 +96,6 @@ function search_content(&$a) {
 
 	nav_set_selected('search');
 
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
-	require_once('include/conversation.php');
 
 	$o = '<h3>' . t('Search') . '</h3>';
 
@@ -117,14 +118,27 @@ function search_content(&$a) {
 		$search = substr($search,1);
 	}
 	if(strpos($search,'@') === 0) {
-		require_once('mod/dirfind.php');
 		return dirfind_content($a);
 	}
 	if(strpos($search,'!') === 0) {
-		require_once('mod/dirfind.php');
 		return dirfind_content($a);
 	}
 
+        if(x($_GET,'search-option'))
+		switch($_GET['search-option']) {
+			case 'fulltext':
+				break;
+			case 'tags':
+				$tag = true;
+				break;
+			case 'contacts':
+				return dirfind_content($a, "@");
+				break;
+			case 'forums':
+				return dirfind_content($a, "!");
+				break;
+		}
+
 	if(! $search)
 		return $o;
 
diff --git a/view/templates/searchbox.tpl b/view/templates/searchbox.tpl
index c3b8752942..b9a01752c0 100644
--- a/view/templates/searchbox.tpl
+++ b/view/templates/searchbox.tpl
@@ -2,6 +2,13 @@
         <form action="{{$action_url}}" method="get" >
                 {{strip}}
                 <input type="text" name="search" id="search-text" placeholder="{{$search_label}}" value="{{$s}}" />
+		<select name="search-option">
+			<option value="fulltext">{{$searchoption.0}}</option>
+			<option value="tags">{{$searchoption.1}}</option>
+			<option value="contacts">{{$searchoption.2}}</option>
+			<option value="forums">{{$searchoption.3}}</option>
+		</select>
+
                 <input type="submit" name="submit" id="search-submit" value="{{$search_label}}" />
                 {{if $savedsearch}}
                 <input type="submit" name="save" id="search-save" value="{{$save_label}}" />
diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
index 8a40d6dd77..5483113f33 100644
--- a/view/theme/vier/templates/nav.tpl
+++ b/view/theme/vier/templates/nav.tpl
@@ -72,6 +72,12 @@
 			<li role="search" id="search-box">
 				<form method="get" action="{{$nav.search.0}}">
 					<input accesskey="s" id="search-text" class="nav-menu-search" type="text" value="" name="search">
+					<select name="search-option">
+						<option value="fulltext">{{$nav.searchoption.0}}</option>
+						<option value="tags">{{$nav.searchoption.1}}</option>
+						<option value="contacts">{{$nav.searchoption.2}}</option>
+						<option value="forums">{{$nav.searchoption.3}}</option>
+					</select>
 				</form>
 			</li>
 		{{/if}}