diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 65471fde..6f79a3aa 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -26,9 +26,7 @@
         href="{{request.script_root + request.path}}?offset={{ pagination.previous_offset }}"
         type="application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"/>
 {% endif %}
-  <link rel="search"
-        href="{{url_for('feed_osd')}}"
-        type="application/opensearchdescription+xml"/>
+  <link title="{{_('Search')}}" type="application/atom+xml" href="{{url_for('feed_normal_search')}}?query={searchTerms}" rel="search"/>
   <title>{{instance}}</title>
   <author>
     <name>{{instance}}</name>
diff --git a/cps/templates/index.xml b/cps/templates/index.xml
index 6fa1bacb..228637c2 100644
--- a/cps/templates/index.xml
+++ b/cps/templates/index.xml
@@ -4,8 +4,7 @@
   <link rel="self" href="{{url_for('feed_index')}}" type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
   <link rel="start" title="{{_('Start')}}" href="{{url_for('feed_index')}}"
         type="application/atom+xml;profile=opds-catalog;kind=navigation"/>
-  <link rel="search" title="{{_('Search')}}" href="{{url_for('feed_osd')}}"
-        type="application/opensearchdescription+xml"/>
+  <link title="{{_('Search')}}" type="application/atom+xml" href="{{url_for('feed_normal_search')}}?query={searchTerms}" rel="search"/>
   <title>{{instance}}</title>
   <author>
     <name>{{instance}}</name>