diff --git a/libxcrypt.spec b/libxcrypt.spec
index 4ac85b9b46d4d92b200323119212969db4f7abce..501dd2743bd964ad52fbe1bfef4b2a90efe22b3a 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -5,7 +5,7 @@
 %endif
 Name:           libxcrypt
 Version:        4.4.26
-Release:        4
+Release:        5
 Summary:        Extended crypt library for DES, MD5, Blowfish and others
 License:        LGPLv2+ and BSD and Public Domain
 URL:            https://github.com/besser82/%{name}
@@ -13,6 +13,8 @@ Source0:        https://github.com/besser82/%{name}/archive/v%{version}.tar.gz
 
 Patch9000:      add-sm3-crypt-support.patch
 Patch9001:      libxcrypt-4.4.26-sw.patch
+Patch9002:	upstream-Fix-warning-about-truncating-conversion.patch
+Patch9003:	upstream-Fix-warning-about-signed-unsigned-conversion.patch
 
 BuildRequires:  autoconf libtool fipscheck
 BuildRequires:  perl >= 5.14.0
@@ -106,6 +108,9 @@ autoreconf -fiv
 
 
 %changelog
+* Fri Jun 9 2023 Chenxi Mao<chenxi.mao@suse.com> - 4.4.26-5
+- Cherry pick upstream patches to fix build errors if avx2 enabled. 
+
 * Fri Oct 21 2022 wuzx<wuzx1226@qq.com> - 4.4.26-4
 - add sw64 patch
 
diff --git a/upstream-Fix-warning-about-signed-unsigned-conversion.patch b/upstream-Fix-warning-about-signed-unsigned-conversion.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5c45ddbe41686d56f4a136294eab89317edc499f
--- /dev/null
+++ b/upstream-Fix-warning-about-signed-unsigned-conversion.patch
@@ -0,0 +1,25 @@
+From 17cf4ce8af5a2a1af4c0f52260019cbae01835b8 Mon Sep 17 00:00:00 2001
+From: Moinak Bhattacharyya <moinakb001@gmail.com>
+Date: Tue, 8 Nov 2022 04:37:13 -0600
+Subject: [PATCH 1/1] Fix warning about signed->unsigned conversion
+
+---
+ lib/alg-yescrypt-opt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/alg-yescrypt-opt.c b/lib/alg-yescrypt-opt.c
+index dacc73b..a33c6e4 100644
+--- a/lib/alg-yescrypt-opt.c
++++ b/lib/alg-yescrypt-opt.c
+@@ -514,7 +514,7 @@ static volatile uint64_t Smask2var = Smask2;
+ #define PWXFORM_SIMD(X) { \
+ 	uint64_t x; \
+ 	FORCE_REGALLOC_1 \
+-	uint32_t lo = (uint32_t)(x = EXTRACT64(X) & Smask2reg); \
++	uint32_t lo = (uint32_t)(x = ((uint64_t)EXTRACT64(X)) & Smask2reg); \
+ 	FORCE_REGALLOC_2 \
+ 	uint32_t hi = x >> 32; \
+ 	X = _mm_mul_epu32(HI32(X), X); \
+-- 
+2.33.0
+
diff --git a/upstream-Fix-warning-about-truncating-conversion.patch b/upstream-Fix-warning-about-truncating-conversion.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5dfe2386bb896ccba710ef588aae3eb12edb7a20
--- /dev/null
+++ b/upstream-Fix-warning-about-truncating-conversion.patch
@@ -0,0 +1,25 @@
+From 239664bf18fc2bc093d8dbaa1fb0a0307651897f Mon Sep 17 00:00:00 2001
+From: Moinak Bhattacharyya <moinakb001@gmail.com>
+Date: Mon, 7 Nov 2022 03:40:23 -0600
+Subject: [PATCH 1/1] Fix warning about truncating conversion
+
+---
+ lib/alg-yescrypt-opt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/alg-yescrypt-opt.c b/lib/alg-yescrypt-opt.c
+index 60a6ccd..dacc73b 100644
+--- a/lib/alg-yescrypt-opt.c
++++ b/lib/alg-yescrypt-opt.c
+@@ -514,7 +514,7 @@ static volatile uint64_t Smask2var = Smask2;
+ #define PWXFORM_SIMD(X) { \
+ 	uint64_t x; \
+ 	FORCE_REGALLOC_1 \
+-	uint32_t lo = x = EXTRACT64(X) & Smask2reg; \
++	uint32_t lo = (uint32_t)(x = EXTRACT64(X) & Smask2reg); \
+ 	FORCE_REGALLOC_2 \
+ 	uint32_t hi = x >> 32; \
+ 	X = _mm_mul_epu32(HI32(X), X); \
+-- 
+2.33.0
+