diff --git a/hugo.yml b/hugo.yml
index 17f8b7b680..c3b566d1e8 100644
--- a/hugo.yml
+++ b/hugo.yml
@@ -28,6 +28,18 @@ enableRobotsTXT:        true
 metaDataFormat:         "yaml"
 disableKinds:           ["404", "taxonomy", "term", "RSS"]
 
+outputFormats:
+  OpenSearch:
+    baseName:           opensearch
+    isPlainText:        true
+    mediaType:          application/xml
+    notAlternative:     true
+
+outputs:
+  home:
+    - HTML
+    - OpenSearch
+
 publishDir:             "_site"
 
 module:
diff --git a/site/layouts/_default/list.opensearch.xml b/site/layouts/_default/list.opensearch.xml
new file mode 100644
index 0000000000..a64e0daeec
--- /dev/null
+++ b/site/layouts/_default/list.opensearch.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
+  <ShortName>{{ .Site.Title }}</ShortName>
+  <Description>Search {{ .Site.Title }} documentation</Description>
+  <Image type="image/x-icon" width="16" height="16">{{ (printf "/docs/%s/assets/img/favicons/favicon.ico" .Site.Params.docs_version) | absURL }}</Image>
+  <Url type="text/html" method="get" template="{{ (printf "/docs/%s/getting-started/introduction/" .Site.Params.docs_version) | absURL }}#search={searchTerms}"/>
+</OpenSearchDescription>
diff --git a/site/layouts/partials/header.html b/site/layouts/partials/header.html
index a7ad916ee8..15047233cf 100644
--- a/site/layouts/partials/header.html
+++ b/site/layouts/partials/header.html
@@ -10,7 +10,10 @@
 <title>{{ if .IsHome }}{{ .Site.Title | markdownify }} · {{ .Site.Params.subtitle | markdownify }}{{ else }}{{ .Title | markdownify }} · {{ .Site.Title | markdownify }} v{{ .Site.Params.docs_version }}{{ end }}</title>
 
 <link rel="canonical" href="{{ .Permalink }}">
-<link rel="search" href="/documentation-search.xml" type="application/opensearchdescription+xml">
+
+{{ with .OutputFormats.Get "opensearch" -}}
+<link rel="search" href="{{ .Permalink }}" title="{{ $.Site.Title }}" type="application/opensearchdescription+xml">
+{{ end -}}
 
 <link rel="preconnect" href="https://AK7KMZKZHQ-dsn.algolia.net" crossorigin>
 
diff --git a/site/static/documentation-search.xml b/site/static/documentation-search.xml
deleted file mode 100644
index 9fdd82d496..0000000000
--- a/site/static/documentation-search.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
-  <ShortName>Bootstrap Documentation</ShortName>
-  <Description>Search in the latest Bootstrap documentation</Description>
-  <Image height="16" width="16" type="image/x-icon">https://deploy-preview-29872--twbs-bootstrap.netlify.com/favicon.ico</Image>
-  <Url type="text/html" method="get" template="https://deploy-preview-29872--twbs-bootstrap.netlify.com/docs/4.3/getting-started/introduction/#search={searchTerms}" />
-</OpenSearchDescription>