diff --git a/mod/opensearch.php b/mod/opensearch.php
new file mode 100644
index 000000000..69afba75c
--- /dev/null
+++ b/mod/opensearch.php
@@ -0,0 +1,18 @@
+<?php
+    function opensearch_content(&$a) {
+    	
+		$tpl = load_view_file('view/opensearch.tpl');
+	
+		header("Content-type: application/opensearchdescription+xml");
+	
+		$o = replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$nodename' => $a->get_hostname(),
+		));
+		
+		echo $o;
+		
+		killme();
+		
+	}
+?>
\ No newline at end of file
diff --git a/view/head.tpl b/view/head.tpl
index 7a5710b2a..1ff0ae1df 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -3,6 +3,10 @@
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 <link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendika" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/opensearch.tpl b/view/opensearch.tpl
new file mode 100644
index 000000000..374fcaac9
--- /dev/null
+++ b/view/opensearch.tpl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+	<ShortName>Friendika@$nodename</ShortName>
+	<Description>Search in Friendika@$nodename</Description>
+	<Contact>http://bugs.friendika.com/</Contact>
+	<Image height="16" width="16" type="image/png">$baseurl/images/friendika-16.png</Image>
+	<Image height="64" width="64" type="image/png">$baseurl/images/friendika-64.png</Image>
+	<Url type="text/html" 
+        template="$baseurl/search?search={searchTerms}"/>
+	<Url type="application/opensearchdescription+xml"
+      	rel="self"
+      	template="$baseurl/opensearch" />        
+</OpenSearchDescription>
\ No newline at end of file