diff --git a/src/main/java/jp/sf/fess/filter/FessEncodingFilter.java b/src/main/java/jp/sf/fess/filter/FessEncodingFilter.java
index 10661df7b..2566de47f 100644
--- a/src/main/java/jp/sf/fess/filter/FessEncodingFilter.java
+++ b/src/main/java/jp/sf/fess/filter/FessEncodingFilter.java
@@ -1,7 +1,6 @@
 package jp.sf.fess.filter;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -24,7 +23,7 @@ import org.codelibs.core.util.StringUtil;
 import org.seasar.extension.filter.EncodingFilter;
 
 public class FessEncodingFilter extends EncodingFilter {
-    public static String ENCODING_MAP = "encoding-map";
+    public static String ENCODING_MAP = "encodingRules";
 
     protected Map<String, String> encodingMap = new ConcurrentHashMap<>();
 
@@ -69,8 +68,11 @@ public class FessEncodingFilter extends EncodingFilter {
                 req.setCharacterEncoding(entry.getValue());
                 final StringBuilder locationBuf = new StringBuilder(1000);
                 final String contextPath = servletContext.getContextPath();
-                locationBuf.append(StringUtil.isBlank(contextPath) ? "/"
-                        : contextPath);
+                if (StringUtil.isNotBlank(contextPath)
+                        && !"/".equals(contextPath)) {
+                    locationBuf.append(contextPath);
+                }
+                locationBuf.append('/');
                 locationBuf.append(servletPath.substring(path.length()));
                 boolean append = false;
                 final Map<String, String[]> parameterMap = new HashMap<>();
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 54bddbe1d..0052e62da 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -27,11 +27,15 @@
 
   <filter>
     <filter-name>encodingfilter</filter-name>
-    <filter-class>org.seasar.extension.filter.EncodingFilter</filter-class>
+    <filter-class>jp.sf.fess.filter.FessEncodingFilter</filter-class>
     <init-param>
       <param-name>encoding</param-name>
       <param-value>UTF-8</param-value>
     </init-param>
+    <init-param>
+      <param-name>encodingRules</param-name>
+      <param-value>sjis:Shift_JIS,eucjp:EUC-JP</param-value>
+    </init-param>
   </filter>
 
   <filter>