diff --git a/src/main/resources/esclient.xml b/src/main/resources/esclient.xml
index 9667fd15a..10e18f9e4 100644
--- a/src/main/resources/esclient.xml
+++ b/src/main/resources/esclient.xml
@@ -360,10 +360,6 @@
 			<arg>"fess"</arg>
 			<arg>"eu/stemmer_override.txt"</arg>
 		</postConstruct>
-		<postConstruct name="addConfigFile">
-			<arg>"fess"</arg>
-			<arg>"fa/stemmer_override.txt"</arg>
-		</postConstruct>
 		<postConstruct name="addConfigFile">
 			<arg>"fess"</arg>
 			<arg>"fi/stemmer_override.txt"</arg>
@@ -396,14 +392,6 @@
 			<arg>"fess"</arg>
 			<arg>"it/stemmer_override.txt"</arg>
 		</postConstruct>
-		<postConstruct name="addConfigFile">
-			<arg>"fess"</arg>
-			<arg>"ja/stemmer_override.txt"</arg>
-		</postConstruct>
-		<postConstruct name="addConfigFile">
-			<arg>"fess"</arg>
-			<arg>"ko/stemmer_override.txt"</arg>
-		</postConstruct>
 		<postConstruct name="addConfigFile">
 			<arg>"fess"</arg>
 			<arg>"lt/stemmer_override.txt"</arg>
@@ -440,26 +428,10 @@
 			<arg>"fess"</arg>
 			<arg>"sv/stemmer_override.txt"</arg>
 		</postConstruct>
-		<postConstruct name="addConfigFile">
-			<arg>"fess"</arg>
-			<arg>"th/stemmer_override.txt"</arg>
-		</postConstruct>
 		<postConstruct name="addConfigFile">
 			<arg>"fess"</arg>
 			<arg>"tr/stemmer_override.txt"</arg>
 		</postConstruct>
-		<postConstruct name="addConfigFile">
-			<arg>"fess"</arg>
-			<arg>"vi/stemmer_override.txt"</arg>
-		</postConstruct>
-		<postConstruct name="addConfigFile">
-			<arg>"fess"</arg>
-			<arg>"zh-cn/stemmer_override.txt"</arg>
-		</postConstruct>
-		<postConstruct name="addConfigFile">
-			<arg>"fess"</arg>
-			<arg>"zh-tw/stemmer_override.txt"</arg>
-		</postConstruct>
 		<!-- fess index -->
 		<postConstruct name="addIndexConfig">
 			<arg>"fess/doc"</arg>
diff --git a/src/main/resources/fess_indices/fess.json b/src/main/resources/fess_indices/fess.json
index dccb98c53..7083c90a1 100644
--- a/src/main/resources/fess_indices/fess.json
+++ b/src/main/resources/fess_indices/fess.json
@@ -440,6 +440,14 @@
             "連体詞"
           ]
         },
+        "japanese_stop": {
+          "type":       "stop",
+          "stopwords_path": "${fess.dictionary.path}ja/stopwords.txt"
+        },
+        "korean_stop": {
+          "type":       "stop",
+          "stopwords_path": "${fess.dictionary.path}ko/stopwords.txt"
+        },
         "latvian_stop": {
           "type":       "stop",
           "stopwords_path": "${fess.dictionary.path}lv/stopwords.txt"
@@ -933,7 +941,8 @@
             "fess_japanese_baseform",
             "fess_japanese_stemmer",
             "japanese_pos_filter",
-            "lowercase"
+            "lowercase",
+            "japanese_stop"
           ]
         },
         "korean_analyzer": {
@@ -941,7 +950,8 @@
           "tokenizer":"korean_tokenizer",
           "filter": [
             "truncate10_filter",
-            "lowercase"
+            "lowercase",
+            "korean_stop"
           ]
         },
         "latvian_analyzer": {
diff --git a/src/main/resources/fess_indices/fess/ja/stopwords.txt b/src/main/resources/fess_indices/fess/ja/stopwords.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/main/resources/fess_indices/fess/ko/stopwords.txt b/src/main/resources/fess_indices/fess/ko/stopwords.txt
new file mode 100644
index 000000000..e69de29bb