diff --git a/1001-ipmitool-gcc10.patch b/1001-ipmitool-gcc10.patch
new file mode 100644
index 0000000000000000000000000000000000000000..53f4ca2482f974c91b2ab7c624a2bf83d9293424
--- /dev/null
+++ b/1001-ipmitool-gcc10.patch
@@ -0,0 +1,40 @@
+From 95f666fa10c32233ee202d8b99d05b5e13528a25 Mon Sep 17 00:00:00 2001
+From: Vaclav Dolezal <vdolezal@redhat.com>
+Date: Thu, 23 Jan 2020 11:26:32 +0100
+Subject: [PATCH] hpmfwupg: move variable definition to .c file
+
+Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
+---
+ include/ipmitool/ipmi_hpmfwupg.h | 2 +-
+ lib/ipmi_hpmfwupg.c              | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h
+index de65292..07f597b 100644
+--- a/include/ipmitool/ipmi_hpmfwupg.h
++++ b/include/ipmitool/ipmi_hpmfwupg.h
+@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO {
+ 	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+ }VERSIONINFO, *PVERSIONINFO;
+ 
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+ 
+ #define TARGET_VER (0x01)
+ #define ROLLBACK_VER (0x02)
+diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c
+index bbcffc0..d7cdcd6 100644
+--- a/lib/ipmi_hpmfwupg.c
++++ b/lib/ipmi_hpmfwupg.c
+@@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
+ 
+ extern int verbose;
+ 
++VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++
+ int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename,
+ 		int activate, int, int);
+ int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx);
+-- 
+2.20.1
+
diff --git a/ipmitool.spec b/ipmitool.spec
index bd803982b49974cb4dd2a49497f262d51c4cbc9f..a9d3f054c1b333b5d0c2bfb4b0831b85b3b4e539 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -1,7 +1,8 @@
+%define anolis_release .0.1
 Name:         ipmitool
 Summary:      Utility for IPMI control
 Version:      1.8.18
-Release:      18%{?dist}
+Release:      18%{anolis_release}%{?dist}
 License:      BSD
 URL:          http://ipmitool.sourceforge.net/
 Source0:      http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
@@ -27,6 +28,11 @@ Patch11:      0011-pef-missing-newline.patch
 Patch12:      0012-lanplus-cipher-retry.patch
 Patch13:      0013-lanplus-Cleanup.-Refix-6dec83ff-fix-be2c0c4b.patch
 
+# Begin: Anolis customized patches
+# backport patch from fc31
+Patch1001:    1001-ipmitool-gcc10.patch
+# End: Anolis customized patches
+
 BuildRequires: openssl-devel readline-devel ncurses-devel
 %{?systemd_requires}
 BuildRequires: systemd
@@ -185,6 +191,9 @@ install -Dm 755 contrib/bmc-snmp-proxy         %{buildroot}%{_libexecdir}/bmc-sn
 %{_libexecdir}/bmc-snmp-proxy
 
 %changelog
+* Thu Jan 20 2022 Weitao Zhou <zhouwt@linux.alibaba.com> 1.8.18-18.0.1
+- add missing header for compatible gcc10 build
+
 * Mon Jul 19 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.8.18-18
 - Protect against negative values to memmove that caused
   "ipmitool sol activate" to crash against an IBM DataPower appliance