diff --git a/actions/opensearch.php b/actions/opensearch.php
new file mode 100644
index 0000000000..cb617391d8
--- /dev/null
+++ b/actions/opensearch.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class OpensearchAction extends Action {
+
+	function handle($args) {
+
+		parent::handle($args);
+
+		header('Content-Type: text/html');
+
+		common_start_xml();
+		common_element_start('OpenSearchDescription', array('xmlns' => 'http://a9.com/-/spec/opensearch/1.1/'));
+
+		common_element('ShortName', NULL, common_config('site', 'name'));
+		common_element('Contact', NULL, common_config('site', 'email'));
+                common_element('Url', array('type' => 'text/html', 'method' => 'get', 
+                               'template' => common_path('index.php?action=peoplesearch&q={searchTerms}'))); 
+                common_element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico')); 
+                common_element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png')); 
+                common_element('AdultContent', NULL, 'false');
+                common_element('Language', NULL, common_language());
+                common_element('OutputEncoding', NULL, 'UTF-8');
+                common_element('InputEncoding', NULL, 'UTF-8');
+
+		common_element_end('OpenSearchDescription');
+		common_end_xml();
+	}
+}
diff --git a/lib/util.php b/lib/util.php
index af31a9bd4f..e8805d8f44 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -185,6 +185,8 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
 	common_element('script', array('type' => 'text/javascript',
 								   'src' => common_path('js/util.js')),
 				   ' ');
+	common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+                                        'href' =>  common_local_url('opensearch'), 'title' => common_config('site', 'name').' Search'));
 
 	if ($callable) {
 		if ($data) {
@@ -761,6 +763,8 @@ function common_fancy_url($action, $args=NULL) {
 		return common_path('rss');
 	 case 'publicxrds':
 		return common_path('xrds');
+	 case 'opensearch':
+		return common_path('opensearch');
 	 case 'doc':
 		return common_path('doc/'.$args['title']);
 	 case 'login':