diff --git a/documentation/themes/beastie/layouts/partials/global-search.html b/documentation/themes/beastie/layouts/partials/global-search.html
index 414de88b13..26b3c0db4b 100644
--- a/documentation/themes/beastie/layouts/partials/global-search.html
+++ b/documentation/themes/beastie/layouts/partials/global-search.html
@@ -1,17 +1,15 @@
 <section class="welcome-container">
   <div class="title-language-container">
     <h2>{{ i18n "freebsd-documentation" }}</h2>
     <a href="#languages" title="Choose language">
       <img src="{{ absLangURL ($.Site.BaseURL ) }}images/language.png" class="language-image" alt="{{ i18n "choose-language" }}">
     </a>
   </div>
   <p>{{ i18n "freebsd-documentation-main-desc" }}</p>
-  <form class="search" method="get" id="search-form" action="https://duckduckgo.com/" onsubmit="document.getElementById('global-search-input').value+=' site:docs.FreeBSD.org OR site:man.FreeBSD.org OR site:wiki.FreeBSD.org'" name="search-form">
-    <input type="hidden" name="ka" value="v">
-    <input type="hidden" name="kt" value="v">
-    <input type="hidden" name="kh" value="1">
-    <input type="hidden" name="kj" value="r2">
-    <input id="global-search-input" name="q" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" value="" placeholder="{{ i18n "global-search-placeholder" }}">
+  {{ $currentLanguage := $.Site.Language }}
+  <form class="search" method="get" id="search-form" action="https://docs.freebsd.org/search" name="search-form">
+    <input type="hidden" name="DB" value="{{ $currentLanguage }}" />
+    <input id="global-search-input" name="P" type="text" size="20" maxlength="255" value="" placeholder="{{ i18n "global-search-placeholder" }}">
     <span>&nbsp;</span>
   </form>
 </section>
diff --git a/documentation/themes/beastie/layouts/partials/site-header.html b/documentation/themes/beastie/layouts/partials/site-header.html
index 9c1af5071c..642ca7e468 100755
--- a/documentation/themes/beastie/layouts/partials/site-header.html
+++ b/documentation/themes/beastie/layouts/partials/site-header.html
@@ -1,107 +1,105 @@
 <header>
   <div class="header-container">
     <div class="logo-menu-bars-container">
       <a href="{{ $.Site.Params.websiteURL }}" class="logo">
       {{ if $.Site.Params.isOnline }}
         <img src="{{ absLangURL ($.Site.BaseURL) }}images/FreeBSD-monochromatic.svg" width="160" height="50" alt="FreeBSD logo" />
       {{ else }}
         <img src="/images/FreeBSD-monochromatic.svg" width="160" height="50" alt="FreeBSD logo" />
       {{ end }}
       </a>
       <label class="menu-bars" for="menu-bars">
         <i class="fa fa-bars" aria-hidden="true"></i>
       </label>
     </div>
     <input id="menu-bars" type="checkbox" />
     <nav>
       <ul class="menu">
         <li class="menu-item">
           <input id="about" type="checkbox" />
           <a href="#" aria-label="Navigate to About section">
             <label class="menu-item-description" for="about">
               {{ i18n "h-about" }}
               <i class="fa fa-angle-down fa-lg" aria-hidden="true"></i>
             </label>
           </a>
           <ul class="sub-menu">
             <li class="title"><a href="https://www.freebsd.org/about/" target="_blank">{{ i18n "h-about" }}</a></li>
             <li><a href="https://www.freebsd.org/about/" target="_blank">{{ i18n "h-freebsd" }}</a></li>
             <li><a href="https://freebsdfoundation.org/about-us/about-the-foundation/" target="_blank">{{ i18n "h-freebsd-foundation" }}</a></li>
             <li><a href="https://www.freebsd.org/internal/code-of-conduct/" target="_blank">{{ i18n "h-code-of-conduct" }}</a></li>
           </ul>
         </li>
         <li class="menu-item">
           <input id="download" type="checkbox" />
           <a href="#" aria-label="Navigate to get FreeBSD section">
             <label class="menu-item-description" for="download">
               {{ i18n "h-get-freebsd" }}
               <i class="fa fa-angle-down fa-lg" aria-hidden="true"></i>
             </label>
           </a>
           <ul class="sub-menu">
             <li class="title"><a href="https://www.freebsd.org/where/" target="_blank">{{ i18n "h-get-freebsd" }}</a></li>
             <li><a href="https://www.freebsd.org/releases/" target="_blank">{{ i18n "h-release-information" }}</a></li>
             <li><a href="https://www.freebsd.org/releng/" target="_blank">{{ i18n "h-release-engineering" }}</a></li>
             <li><a href="https://www.freebsd.org/security/" target="_blank">{{ i18n "h-security-advisories" }}</a></li>
           </ul>
         </li>
         <li class="menu-item">
           <input id="documentation" type="checkbox" />
           <a href="#" aria-label="Navigate to get Documentation section">
             <label class="menu-item-description" for="documentation">
               {{ i18n "h-documentation" }}
               <i class="fa fa-angle-down fa-lg" aria-hidden="true"></i>
             </label>
           </a>
           <ul class="sub-menu">
             <li class="title"><a href="{{ .Site.BaseURL | relLangURL }}">{{ i18n "h-documentation-portal" }}</a></li>
             <li><a href={{ "books/handbook" | absLangURL }}>{{ i18n "h-freebsd-handbook" }}</a></li>
             <li><a href={{ "books/porters-handbook" | absLangURL }}>{{ i18n "h-porter-handbook" }}</a></li>
             <li><a href="https://docs.FreeBSD.org/en/books/fdp-primer">{{ i18n "h-documentation-handbook" }}</a></li>
             <li><a href="https://man.FreeBSD.org" target="_blank">{{ i18n "h-manual-pages" }}</a></li>
             <li><a href="https://papers.FreeBSD.org" target="_blank">{{ i18n "h-presentation-and-papers" }}</a></li>
             <li><a href="https://wiki.FreeBSD.org" target="_blank">{{ i18n "h-wiki" }}</a></li>
             <li><a href={{ "books" | absLangURL }}>{{ i18n "h-books" }}</a></li>
             <li><a href={{ "articles" | absLangURL }}>{{ i18n "h-articles" }}</a></li>
           </ul>
         </li>
         <li class="menu-item">
           <input id="community" type="checkbox" />
           <a href="#" aria-label="Navigate to get Community section">
             <label class="menu-item-description" for="community">
               {{ i18n "h-community" }}
               <i class="fa fa-angle-down fa-lg" aria-hidden="true"></i>
             </label>
           </a>
           <ul class="sub-menu">
             <li class="title"><a href="https://www.freebsd.org/community/">{{ i18n "h-community" }}</a></li>
             <li><a href={{ "articles/contributing" | absLangURL }}>{{ i18n "h-get-involved" }}</a></li>
             <li><a href="https://forums.freebsd.org/" target="_blank">{{ i18n "h-community-forum" }}</a></li>
             <li><a href="https://lists.freebsd.org/" target="_blank">{{ i18n "h-mailing-lists" }}</a></li>
             <li><a href="https://wiki.freebsd.org/IRC/Channels" target="_blank">{{ i18n "h-irc-channels" }}</a></li>
             <li><a href="https://bugs.freebsd.org/bugzilla/" target="_blank">{{ i18n "h-bug-tracker" }}</a></li>
             <li><a href="https://www.freebsd.org/support/" target="_blank">{{ i18n "h-support" }}</a></li>
           </ul>
         </li>
       </ul>
     </nav>
     <div class="search-donate-container">
-      <form class="search" method="get" id="search-header-form" action="https://duckduckgo.com/" onsubmit="document.getElementById('words').value+=' site:FreeBSD.org'" name="search-header-form">
-        <input type="hidden" name="ka" value="v" />
-        <input type="hidden" name="kt" value="v" />
-        <input type="hidden" name="kh" value="1" />
-        <input type="hidden" name="kj" value="r2" />
-        <input id="words" name="q" type="text" size="20" maxlength="255" onfocus="if( this.value==this.defaultValue ) this.value='';" />
+      {{ $currentLanguage := $.Site.Language }}
+      <form class="search" method="get" id="search-header-form" action="https://docs.freebsd.org/search" name="search-header-form">
+        <input type="hidden" name="DB" value="{{ $currentLanguage }}" />
+        <input id="words" name="P" type="text" size="20" maxlength="255" value="" />
         <button>
           <i class="fa fa-search" aria-hidden="true"></i>
         </button>
       </form>
       <div class="donate">
         <a href="https://freebsdfoundation.org/donate/" target="_blank">
           <span class="heart">♥</span>
           {{ i18n "h-donate" }}
         </a>
       </div>
     </div>
   </div>
 </header>