diff --git a/docs/changelog.md b/docs/changelog.md
index 8186b16e..c2ef3ef5 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -11,6 +11,7 @@
 - 优化文档分页title标题；
 - 修正自动提取关键词功能；
 - 修正开启绝对链接文档正文上传图片问题；
+- 编辑页面关键词可选择自动生成；
 - 其他常规问题修复；
 
 # V6.5.8
diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php
index 56848e45..c369aca1 100644
--- a/src/admin/article_edit.php
+++ b/src/admin/article_edit.php
@@ -82,7 +82,6 @@ if ($dopost != 'save') {
     $source = cn_substrR($source, 255);
     $description = cn_substrR($description, 255);
     $keywords = trim(cn_substrR($keywords, 255));
-    if (empty($keywords)) $autokey = 1;
     $filename = trim(cn_substrR($filename, 50));
     $isremote  = 0;
     $serviterm = empty($serviterm) ? "" : $serviterm;
diff --git a/src/admin/templets/album_edit.htm b/src/admin/templets/album_edit.htm
index 6914be5c..c014c59e 100644
--- a/src/admin/templets/album_edit.htm
+++ b/src/admin/templets/album_edit.htm
@@ -122,7 +122,11 @@
 								<?php }?>
 								<tr>
 									<td>关键词</td>
-									<td colspan="3"><input type="text" name="keywords" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg"></td>
+									<td colspan="3">
+										<input type="text" name="keywords" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg">
+										<label><input type="checkbox" name="autokey" id="autokey" value="1" <?php if ($cfg_arc_autokeyword=='Y') echo 'checked';?>> 自动获取</label>
+										<button type="button" onclick="SelectKeywords('form1.keywords');" class="btn btn-success btn-sm">选择</button>
+									</td>
 								</tr>
 								<tr>
 									<td>描述</td>
diff --git a/src/admin/templets/archives_edit.htm b/src/admin/templets/archives_edit.htm
index 5430ba1e..e42150cd 100644
--- a/src/admin/templets/archives_edit.htm
+++ b/src/admin/templets/archives_edit.htm
@@ -124,7 +124,11 @@
 									<?php }}?>
 									<tr>
 										<td>关键词</td>
-										<td colspan="3"><input type="text" name="keywords" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg"></td>
+										<td colspan="3">
+											<input type="text" name="keywords" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg">
+											<label><input type="checkbox" name="autokey" id="autokey" value="1" <?php if ($cfg_arc_autokeyword=='Y') echo 'checked';?>> 自动获取</label>
+											<button type="button" onclick="SelectKeywords('form1.keywords');" class="btn btn-success btn-sm">选择</button>
+										</td>
 									</tr>
 									<tr>
 										<td>描述</td>
diff --git a/src/admin/templets/article_edit.htm b/src/admin/templets/article_edit.htm
index 7f3cea99..efe01321 100644
--- a/src/admin/templets/article_edit.htm
+++ b/src/admin/templets/article_edit.htm
@@ -123,7 +123,11 @@
 									<?php }?>
 									<tr>
 										<td>关键词</td>
-										<td colspan="3"><input type="text" name="keywords" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg"></td>
+										<td colspan="3">
+											<input type="text" name="keywords" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg">
+											<label><input type="checkbox" name="autokey" id="autokey" value="1" <?php if ($cfg_arc_autokeyword=='Y') echo 'checked';?>> 自动获取</label>
+											<button type="button" onclick="SelectKeywords('form1.keywords');" class="btn btn-success btn-sm">选择</button>
+										</td>
 									</tr>
 									<tr>
 										<td>描述</td>
diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm
index 56538101..9d1c2cd9 100644
--- a/src/admin/templets/index_body.htm
+++ b/src/admin/templets/index_body.htm
@@ -145,7 +145,7 @@
 								<span id="step1Msg">对比版本更改的文件</span>
 							</div>
 							<div id="stepArea2" class="stepArea">
-								<p>本更新提供了重要的安全性更新，建议所有会员升级，软件更新覆盖以下文件，请做好备份</p>
+								<p>本更新包含重要安全补丁，建议所有用户升级。请备份相关文件，并确保目录有写入权限</p>
 								<div id="_fileList">正在加载</div>
 							</div>
 							<div id="stepArea3" class="stepArea">
diff --git a/src/admin/templets/soft_edit.htm b/src/admin/templets/soft_edit.htm
index eab35aa3..290a8785 100644
--- a/src/admin/templets/soft_edit.htm
+++ b/src/admin/templets/soft_edit.htm
@@ -134,7 +134,11 @@
 									<?php }?>
 									<tr>
 										<td>关键词</td>
-										<td colspan="3"><input type="text" name="keywords" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg"></td>
+										<td colspan="3">
+											<input type="text" name="keywords" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg">
+											<label><input type="checkbox" name="autokey" id="autokey" value="1" <?php if ($cfg_arc_autokeyword=='Y') echo 'checked';?>> 自动获取</label>
+											<button type="button" onclick="SelectKeywords('form1.keywords');" class="btn btn-success btn-sm">选择</button>
+										</td>
 									</tr>
 									<tr>
 										<td>描述</td>
diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm
index ad3f135a..612e7ca7 100644
--- a/src/admin/templets/spec_edit.htm
+++ b/src/admin/templets/spec_edit.htm
@@ -124,7 +124,11 @@
 									</tr>
 									<tr>
 										<td>关键词</td>
-										<td class="3"><label><input type="text" name="keywords" rows="3" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg"></label></td>
+										<td class="3">
+											<label><input type="text" name="keywords" rows="3" id="keywords" value="<?php echo $arcRow['keywords']?>" class="admin-input-lg"></label>
+											<label><input type="checkbox" name="autokey" id="autokey" value="1" <?php if ($cfg_arc_autokeyword=='Y') echo 'checked';?>> 自动获取</label>
+											<button type="button" onclick="SelectKeywords('form1.keywords');" class="btn btn-success btn-sm">选择</button>
+										</td>
 									</tr>
 									<tr>
 										<td>专题说明</td>