diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
index 1cb95288a..f5cb7b2e9 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
@@ -80,6 +80,8 @@ public class AdminUpgradeAction extends FessAdminAction {
 
     private static final String VERSION_13_8 = "13.8";
 
+    private static final String VERSION_13_9 = "13.9";
+
     // ===================================================================================
     //                                                                           Attribute
     //
@@ -163,6 +165,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -189,6 +192,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -214,6 +218,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -238,6 +243,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -261,6 +267,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -283,6 +290,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -304,6 +312,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -343,6 +352,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -361,6 +371,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -378,6 +389,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -394,6 +406,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -409,6 +422,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -423,6 +437,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_6();
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -430,12 +445,13 @@ public class AdminUpgradeAction extends FessAdminAction {
                 systemHelper.reloadConfiguration();
             } catch (final Exception e) {
                 logger.warn("Failed to upgrade data.", e);
-                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_5, e.getLocalizedMessage()));
+                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_6, e.getLocalizedMessage()));
             }
         } else if (VERSION_13_7.equals(form.targetVersion)) {
             try {
                 upgradeFrom13_7();
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -443,11 +459,12 @@ public class AdminUpgradeAction extends FessAdminAction {
                 systemHelper.reloadConfiguration();
             } catch (final Exception e) {
                 logger.warn("Failed to upgrade data.", e);
-                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_5, e.getLocalizedMessage()));
+                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_7, e.getLocalizedMessage()));
             }
         } else if (VERSION_13_8.equals(form.targetVersion)) {
             try {
                 upgradeFrom13_8();
+                upgradeFrom13_9();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -455,7 +472,19 @@ public class AdminUpgradeAction extends FessAdminAction {
                 systemHelper.reloadConfiguration();
             } catch (final Exception e) {
                 logger.warn("Failed to upgrade data.", e);
-                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_5, e.getLocalizedMessage()));
+                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_8, e.getLocalizedMessage()));
+            }
+        } else if (VERSION_13_9.equals(form.targetVersion)) {
+            try {
+                upgradeFrom13_9();
+                upgradeFromAll();
+
+                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
+
+                systemHelper.reloadConfiguration();
+            } catch (final Exception e) {
+                logger.warn("Failed to upgrade data.", e);
+                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_9, e.getLocalizedMessage()));
             }
         } else {
             saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
@@ -540,6 +569,10 @@ public class AdminUpgradeAction extends FessAdminAction {
         // nothing
     }
 
+    private void upgradeFrom13_9() {
+        // nothing
+    }
+
     private void upgradeFromAll() {
         // nothing
     }
diff --git a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
index 4ed9f2842..96b96b5c0 100644
--- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
@@ -67,6 +67,7 @@
 											<la:option value="13.6">13.6</la:option>
 											<la:option value="13.7">13.7</la:option>
 											<la:option value="13.8">13.8</la:option>
+											<la:option value="13.9">13.9</la:option>
 										</la:select>
 									</div>
 								</div>