diff --git a/base/net-snmp/PKG-INFO b/base/net-snmp/PKG-INFO
index 420722dd7..20139dd10 100644
--- a/base/net-snmp/PKG-INFO
+++ b/base/net-snmp/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: net-snmp
-Version: 5.7.2
+Version: 5.8
 Summary: A collection of SNMP protocol tools and libraries
 Home-page: 
 Author:
diff --git a/base/net-snmp/centos/build_srpm.data b/base/net-snmp/centos/build_srpm.data
index 12d13e88f..0a1cce723 100644
--- a/base/net-snmp/centos/build_srpm.data
+++ b/base/net-snmp/centos/build_srpm.data
@@ -1,2 +1,2 @@
-TIS_PATCH_VER=11
+TIS_PATCH_VER=1
 BUILD_IS_SLOW=3
diff --git a/base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
index 408b7e8d4..da8ada22e 100644
--- a/base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ b/base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
@@ -1,8 +1,9 @@
 From c25a30b4a0c7347234c2af4afab099b5735bbf71 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 17:05:59 -0400
-Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
+Subject: [PATCH] 0001-Update-package-versioning-for-TIS-format.patch
 
+Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
 ---
  SPECS/net-snmp.spec | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -11,15 +12,15 @@ diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
 index a59db4f..8a24ba1 100644
 --- a/SPECS/net-snmp.spec
 +++ b/SPECS/net-snmp.spec
-@@ -11,7 +11,7 @@
- Summary: A collection of SNMP protocol tools and libraries
- Name: net-snmp
- Version: 5.7.2
--Release: 37%{?dist}
-+Release: 37.el7%{?_tis_dist}.%{tis_patch_ver}
- Epoch: 1
-
- License: BSD
---
-2.7.4
+@@ -10,7 +10,7 @@
+ Summary:    A collection of SNMP protocol tools and libraries
+ Name:       net-snmp
+ Version:    5.8
+-Release:    7%{?dist}.1
++Release:    7.el8_0%{?_tis_dist}.%{tis_patch_ver}.1
+ Epoch:      1
+ 
+ License:    BSD
+-- 
+1.8.3.1
 
diff --git a/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch b/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch
index 1182249a2..b66850c8a 100644
--- a/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch
+++ b/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch
@@ -1,39 +1,44 @@
+Signed-off-by: Dongqi Chen <chen.dq@neusoft.com>
+---
+ SPECS/net-snmp.spec | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
 diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
 index 8a24ba1..40af31f 100644
 --- a/SPECS/net-snmp.spec
 +++ b/SPECS/net-snmp.spec
 @@ -1,3 +1,6 @@
-+# WRS: Disable check
++# Disable check
 +%global netsnmp_check 0
 +
- # use netsnmp_tcp_wrappers 0 to disable tcp_wrappers support
- %{!?netsnmp_tcp_wrappers:%global netsnmp_tcp_wrappers 1}
  # use nestnmp_check 0 to speed up packaging by disabling 'make test'
-@@ -339,7 +342,7 @@ rm testing/fulltests/default/T200*
- %endif
-
- %build
+ %{!?netsnmp_check: %global netsnmp_check 1}
+ 
+@@ -196,7 +199,7 @@ rm testing/fulltests/default/T200*
+ # Autoreconf to get autoconf 2.69 for ARM (#926223)
+ autoreconf
+ 
 -MIBS="host agentx smux \
 +MIBS="agentx smux \
       ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \
       ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \
       ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \
-@@ -360,6 +363,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
+@@ -222,6 +225,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
+     --with-ldflags="-Wl,-z,relro -Wl,-z,now" \
      --with-logfile="/var/log/snmpd.log" \
-     --with-persistent-directory="/var/lib/net-snmp" \
      --with-mib-modules="$MIBS" \
 +    --with-out-mib-modules=host \
- %if %{netsnmp_tcp_wrappers}
-     --with-libwrap=yes \
- %endif
-@@ -378,6 +382,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
-     --with-security-modules=tsm  \
      --with-mysql \
+     --with-openssl \
+     --with-persistent-directory="/var/lib/net-snmp" \
+@@ -232,6 +236,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
      --with-systemd \
+     --with-temp-file-pattern=/var/run/net-snmp/snmp-tmp-XXXXXX \
+     --with-transports="DTLSUDP TLSTCP" \
 +    --without-nl \
      --with-sys-contact="root@localhost" <<EOF
  EOF
-
---
+ 
+-- 
 1.8.3.1
 
diff --git a/base/net-snmp/centos/srpm_path b/base/net-snmp/centos/srpm_path
index 4de7e4e99..2a6de8049 100644
--- a/base/net-snmp/centos/srpm_path
+++ b/base/net-snmp/centos/srpm_path
@@ -1 +1 @@
-mirror:Source/net-snmp-5.7.2-37.el7.src.rpm
+mirror:Source/net-snmp-5.8-7.el8_0.1.src.rpm