diff --git a/README.en.md b/README.en.md
index 075ef3fd1d512b936515004d935c541616ba1559..3ef0e445cce4aa82156982d220c6f02d1162a2f9 100644
--- a/README.en.md
+++ b/README.en.md
@@ -1,36 +1,120 @@
 # tidy
 
 #### Description
-Utility to clean up and pretty print HTML/XHTML/XML
+Utility to clean up and pretty print HTML/XHTML/XML.
 
 #### Software Architecture
 Software architecture description
 
 #### Installation
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+1.  dnf install tidy
+2.  yum install tidy
 
 #### Instructions
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+tidy [options...] [file...] [options...] [file...]
+
+File manipulation
+-----------------
+````
+ -output <file>, -o <file>  write output to the specified <file>              
+ -config <file>             set configuration options from the specified <file>                                            
+ -file <file>, -f <file>    write errors and warnings to the specified <file> 
+ -modify, -m                modify the original input files                   
+````
+
+Processing directives
+---------------------
+````
+ -indent, -i                indent element content                            
+ -wrap <column>, -w         wrap text at the specified <column>. 0 is assumed 
+ <column>                   if <column> is missing. When this option is omitted, the default of the configuration option 'wrap' applies. 
+ -upper, -u                 force tags to upper case                          
+ -clean, -c                 replace FONT, NOBR and CENTER tags with CSS       
+ -bare, -b                  strip out smart quotes and em dashes, etc.        
+ -gdoc, -g                  produce clean version of html exported by Google Docs                                              
+ -numeric, -n               output numeric rather than named entities         
+ -errors, -e                show only errors and warnings                     
+ -quiet, -q                 suppress nonessential output                      
+ -omit                      omit optional start tags and end tags             
+ -xml                       specify the input is well formed XML              
+ -asxml, -asxhtml           convert HTML to well formed XHTML                 
+ -ashtml                    force XHTML to well formed HTML                   
+ -access <level>            do additional accessibility checks (<level> = 0, 1, 2, 3). 0 is assumed if <level> is missing.     
+````
+
+Character encodings
+-------------------
+````
+ -raw                       output values above 127 without conversion to entities                                          
+ -ascii                     use ISO-8859-1 for input, US-ASCII for output     
+ -latin0                    use ISO-8859-15 for input, US-ASCII for output    
+ -latin1                    use ISO-8859-1 for both input and output          
+ -iso2022                   use ISO-2022 for both input and output            
+ -utf8                      use UTF-8 for both input and output               
+ -mac                       use MacRoman for input, US-ASCII for output       
+ -win1252                   use Windows-1252 for input, US-ASCII for output   
+ -ibm858                    use IBM-858 (CP850+Euro) for input, US-ASCII for output                                            
+ -utf16le                   use UTF-16LE for both input and output            
+ -utf16be                   use UTF-16BE for both input and output            
+ -utf16                     use UTF-16 for both input and output              
+ -big5                      use Big5 for both input and output                
+ -shiftjis                  use Shift_JIS for both input and output           
+````
+
+Miscellaneous
+-------------
+````
+ -version, -v               show the version of Tidy                          
+ -help, -h, -?              list the command line options                     
+ -help-config               list all configuration options                    
+ -help-env                  show information about the environment and runtime configuration                                     
+ -show-config               list the current configuration settings           
+ -export-config             list the current configuration settings, suitable for a config file                                 
+ -export-default-config     list the default configuration settings, suitable for a config file                                 
+ -help-option <option>      show a description of the <option>                
+ -language <lang>           set Tidy's output language to <lang>. Specify '-language help' for more help. Use before output-causing arguments to ensure the language takes effect, e.g.,`tidy -lang es -lang help`.    
+````
+
+XML
+---
+````
+ -xml-help                  list the command line options in XML format       
+ -xml-config                list all configuration options in XML format      
+ -xml-strings               output all of Tidy's strings in XML format        
+ -xml-error-strings         output error constants and strings in XML format  
+ -xml-options-strings       output option descriptions in XML format    
+````
+
+Tidy Configuration Options
+==========================
+````
+ Use Tidy's configuration options as command line arguments in the form of "--some-option <value>", for example, "--indent-with-tabs yes".
+ You can also specify a file containing configuration options with the -config <file> directive, or in one or more files specific to your environment (see next section). 
+ For a list of all configuration options, use "-help-config" or refer to the man page (if your OS has one).
+````
+
+Configuration Files
+===================
+````
+ If your environment has an $HTML_TIDY variable set to point to a Tidy configuration file, then Tidy will attempt to use it. 
+ Additionally, Tidy will automatically attempt to use configuration specified in these files, if present: 
+  /etc/tidy.conf 
+  ~/.tidyrc 
+ Use "-help-env" for more information about how you can use the environment to specify Tidy options. 
+````
+
+Other
+=====
+````
+ Input/Output default to stdin/stdout respectively.
+ Single letter options apart from -f may be combined as in:  tidy -f errs.txt -imu foo.html
+````
 
 #### Contribution
 
 1.  Fork the repository
 2.  Create Feat_xxx branch
 3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+4.  Create Pull Request
\ No newline at end of file
diff --git a/README.md b/README.md
index 72abfafbe44cd8eddd1921ddb0e30376546108e1..c14f740c4298e4958aa1a7e73de3134fc054d077 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # tidy
 
 #### 介绍
-Utility to clean up and pretty print HTML/XHTML/XML
+用于清理、美化HTML/XHTML/XML文件的工具
 
 #### 软件架构
 软件架构说明
@@ -9,29 +9,113 @@ Utility to clean up and pretty print HTML/XHTML/XML
 
 #### 安装教程
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+1.  dnf install tidy
+2.  yum install tidy
 
 #### 使用说明
 
-1.  xxxx
-2.  xxxx
-3.  xxxx
+tidy [选项...] [文件...] [选项...] [文件...]
+
+文件操作
+-----------------
+````
+-output <file>, -o <file>   将输出写入指定的 <file>
+-config <file>              从指定的 <file> 设置配置选项
+-file <file>, -f <file>     将错误和警告写入指定的 <file>
+-modify, -m                 修改原始输入文件
+````
+
+处理指令
+---------------------
+````
+-indent, -i                 缩进元素内容
+-wrap <column>, -w          在指定的 <column> 处换行文本。假设为 0
+<column>                    如果 <column> 缺失。当省略此选项时，配置选项 'wrap' 的默认值适用。
+-upper, -u                  强制标签为大写
+-clean, -c                  用 CSS 替换 FONT、NOBR 和 CENTER 标签
+-bare, -b                   去掉智能引号和破折号等。
+-gdoc, -g                   生成 Google Docs 导出的 html 的干净版本
+-numeric, -n                输出数字而不是命名实体
+-errors, -e                 只显示错误和警告
+-quiet, -q                  抑制不必要的输出
+-omit                       省略可选的开始标签和结束标签
+-xml                        指定输入是格式良好的 XML
+-asxml, -asxhtml            将 HTML 转换为格式良好的 XHTML
+-ashtml                     强制 XHTML 为格式良好的 HTML
+-access <level>             做额外的可访问性检查 (<level> = 0, 1, 2, 3)。如果 <level> 缺失，则假定为 0。
+````
+
+字符编码
+-------------------
+````
+-                           未转换为实体的原始输出值高于 127
+-ascii                      使用 ISO-8859-1 作为输入，US-ASCII 作为输出
+-latin0                     输入使用 ISO-8859-15，输出使用 US-ASCII
+-latin1                     使用 ISO-8859-1 作为输入和输出
+-iso2022                    输入和输出都使用 ISO-2022
+-utf8                       输入和输出都使用 UTF-8
+-mac                        使用 MacRoman 输入，US-ASCII 输出
+-win1252                    使用 Windows-1252 作为输入，US-ASCII 作为输出
+-ibm858                     使用 IBM-858 (CP850+Euro) 作为输入，US-ASCII 作为输出
+-utf16le                    对输入和输出都使用 UTF-16LE
+-utf16be                    对输入和输出都使用 UTF-16BE
+-utf16                      输入和输出都使用 UTF-16
+-big5                       使用 Big5 作为输入和输出
+-shiftjis                   使用 Shift_JIS 作为输入和输出
+````
+
+杂项
+-------------
+````
+-version, -v                显示 Tidy 的版本
+-help，-h，-？              列出命令行选项
+-help-config                列出所有配置选项
+-help-env                   显示有关环境和运行时配置的信息
+-show-config                列出当前的配置设置
+-export-config              列出当前的配置设置，适用于一个配置文件
+-export-default-config      列出默认配置设置，适用于一个配置文件
+-help-option <option>       显示 <option> 的描述
+-language <lang>            将 Tidy 的输出语言设置为 <lang>。指定“-language help”以获得更多帮助。在导致输出的参数之前使用以确保语言生效，例如`tidy -lang es -lang help`。
+````
+
+XML
+----
+````
+-xml-help                   列出XML格式的命令行选项
+-xml-config                 以XML格式列出所有配置选项
+-xml-strings                以XML格式输出Tidy的所有字符串
+-xml-error-strings          以XML格式输出错误常量和字符串
+-xml-options-strings        以XML格式输出选项描述
+````
+
+tidy的配置选项
+--------------
+````
+ 使用 Tidy 的配置选项作为表单中的命令行参数“--some-option <value>”，例如“--indent-with-tabs yes”。
+ 您还可以使用以下命令指定包含配置选项的文件-config <file> 指令，或在一个或多个特定于您的文件中环境（见下一节）。
+ 有关所有配置选项的列表，请使用“-help-config”或参考到手册页（如果您的操作系统有）。
+````
+
+配置文件
+--------
+````
+ 如果您的环境将 $HTML_TIDY 变量设置为指向 Tidy 配置文件，然后 Tidy 将尝试使用它。
+ 此外，Tidy 将自动尝试使用指定的配置在这些文件中（如果存在）：
+ /etc/tidy.conf
+ ~/.tidyrc
+ 使用“-help-env”获取有关如何使用环境的更多信息来指定tidy选项。
+````
+
+其他
+-----
+````
+ 输入/输出分别默认为 stdin/stdout。
+ 除了 -f 之外的单个字母选项可以组合使用，如：tidy -f errs.txt -imu foo.html
+````
 
 #### 参与贡献
 
 1.  Fork 本仓库
 2.  新建 Feat_xxx 分支
 3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+4.  新建 Pull Request
\ No newline at end of file
diff --git a/fix-memleak-in-GetTokenFromStream.patch b/fix-memleak-in-GetTokenFromStream.patch
deleted file mode 100644
index d0bbef0effdc7b6fee0f0a9d166b1590e7b6557a..0000000000000000000000000000000000000000
--- a/fix-memleak-in-GetTokenFromStream.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4377ab84a4a2748d72be91d26210567cc933c760 Mon Sep 17 00:00:00 2001
-From: lutianxiong <lutianxiong@huawei.com>
-Date: Sat, 20 Jun 2020 09:19:17 +0800
-Subject: [PATCH 095/109] fix memleak in GetTokenFromStream
-
-check asp & php if ParseAttribute return NULL
----
- src/lexer.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/lexer.c b/src/lexer.c
-index ca66aee..bbc1e15 100644
---- a/src/lexer.c
-+++ b/src/lexer.c
-@@ -3263,6 +3263,22 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
- 
-                     if (!name)
-                     {
-+                        /* check if attributes are created by ASP markup */
-+                        if (asp)
-+                        {
-+                            av = TY_(NewAttribute)(doc);
-+                            av->asp = asp;
-+                            AddAttrToList( &attributes, av ); 
-+                        }
-+
-+                        /* check if attributes are created by PHP markup */
-+                        if (php)
-+                        {
-+                            av = TY_(NewAttribute)(doc);
-+                            av->php = php;
-+                            AddAttrToList( &attributes, av ); 
-+                        }
-+                      
-                         /* fix for http://tidy.sf.net/bug/788031 */
-                         lexer->lexsize -= 1;
-                         lexer->txtend = lexer->txtstart;
--- 
-1.8.3.1
-
diff --git a/free-attributes-before-return-NULL.patch b/free-attributes-before-return-NULL.patch
deleted file mode 100644
index 945c2c770e787bd10b0a46b7861f291eebcd2820..0000000000000000000000000000000000000000
--- a/free-attributes-before-return-NULL.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8f0e7aa22a854add9e6082ca5136e82f032a236a Mon Sep 17 00:00:00 2001
-From: lutianxiong <lutianxiong@huawei.com>
-Date: Sun, 22 Nov 2020 00:10:12 +0800
-Subject: [PATCH] Free attributes before return NULL (#899)
-
----
- src/lexer.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/lexer.c b/src/lexer.c
-index 49b74f5..16a8fef 100644
---- a/src/lexer.c
-+++ b/src/lexer.c
-@@ -3469,6 +3469,10 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
-         return node;  /* the COMMENT token */
-     }
- 
-+    /* check attributes before return NULL */
-+    if (attributes)
-+        TY_(FreeAttribute)( doc, attributes );
-+
-     DEBUG_LOG(SPRTF("Returning NULL...\n"));
-     return NULL;
- }
--- 
-1.8.3.1
-
diff --git a/tidy-html5-5.7.28.tar.gz b/tidy-html5-5.7.28.tar.gz
deleted file mode 100644
index 1516b97b71e7eb5d4e92ba5ace90a9be8a1fd7ec..0000000000000000000000000000000000000000
Binary files a/tidy-html5-5.7.28.tar.gz and /dev/null differ
diff --git a/tidy-html5-5.8.0.tar.gz b/tidy-html5-5.8.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..53c7c9e342daec31e5f989facc4db7a2113a357f
Binary files /dev/null and b/tidy-html5-5.8.0.tar.gz differ
diff --git a/tidy.spec b/tidy.spec
index b5ccc719c29efa4da4ebab037cd5336892450ebf..c76a6caee0fae85f51baad646e40772234d7c52d 100644
--- a/tidy.spec
+++ b/tidy.spec
@@ -2,16 +2,13 @@
 %global upname tidy-html5
 
 Name:          tidy
-Version:       5.7.28
+Version:       5.8.0
 Release:       1
 Summary:       Utility to clean up and pretty print HTML/XHTML/XML
 License:       W3C
 URL:           http://www.html-tidy.org/
 Source0:       https://github.com/htacg/%{upname}/archive/%{version}.tar.gz#/%{upname}-%{version}.tar.gz
 
-Patch0:        fix-memleak-in-GetTokenFromStream.patch
-Patch1:        free-attributes-before-return-NULL.patch
-
 BuildRequires: gcc-c++ cmake gcc libxslt pkgconfig
 Provides:      tidy-html5 = %{version}-%{release}
 Requires:      %{libname}%{?_isa} = %{version}-%{release}
@@ -81,6 +78,9 @@ ln -s tidyplatform.h $RPM_BUILD_ROOT%{_includedir}/platform.h
 %{_mandir}/*
 
 %changelog
+* Fri Jul 16 2021 dourylee <dourylee@huawei.com> - 5.8.0-1
+- Update to version 5.8.0
+
 * Tue Jan 26 2021 fuanan <fuanan3@huawei.com> - 5.7.28-1
 - Update to version 5.7.28