diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 07cb7b0375..03a147a71e 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -4,6 +4,12 @@
           <span data-search-clear=""><i class="fas fa-times"></i></span>
         </div>
         {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
-        <script src="{{"js/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
+        {{- $pageBaseLang := replaceRE "([a-z]+).*" "${1}" .Page.Lang }}
+        <script>
+          var pageBaseLang="{{ $pageBaseLang }}";
+        </script>
         <script src="{{"js/auto-complete.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
+        <script src="{{"js/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
+        <script src="{{"js/lunr.stemmer.support.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
+        <script src="{{ (printf "js/lunr.%s.min.js" $pageBaseLang) | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
         <script src="{{ "js/search.js" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
\ No newline at end of file
diff --git a/static/js/search.js b/static/js/search.js
index ed083dbdd7..50767bc706 100644
--- a/static/js/search.js
+++ b/static/js/search.js
@@ -9,6 +9,10 @@ function initLunr() {
             // Set up lunrjs by declaring the fields we use
             // Also provide their boost level for the ranking
             lunrIndex = lunr(function() {
+                if(lunr[pageBaseLang]){
+                    this.use(lunr[pageBaseLang]);
+                }
+
                 this.ref('index');
                 this.field('title', {
                     boost: 15