diff --git a/app-arch/p7zip/patches/p7zip-17.04.patchset b/app-arch/p7zip/patches/p7zip-17.04.patchset
index 5f2d1b963..34eb6373f 100644
--- a/app-arch/p7zip/patches/p7zip-17.04.patchset
+++ b/app-arch/p7zip/patches/p7zip-17.04.patchset
@@ -1,4 +1,4 @@
-From 247a468e06a417751e305fec7c8496eeb81dde9d Mon Sep 17 00:00:00 2001
+From 1dbcc13229450c14c4ea1676d36bbba68cee6e42 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 14 Feb 2016 10:08:25 +0100
 Subject: applying patch p7zip-9.20.1.patch
@@ -30,7 +30,7 @@ index 322fce2..69a9f43 100644
 2.30.0
 
 
-From cd51376c43dfcbc64fe64a7f06d785744d5d28fc Mon Sep 17 00:00:00 2001
+From 4c29d321f68e6a17428951e821dfdae1cfb85217 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Sun, 14 Feb 2016 10:15:58 +0100
 Subject: Fix detection of RAM size.
@@ -53,7 +53,7 @@ index 69a9f43..5b4e0d9 100644
 2.30.0
 
 
-From 68774e5ef5d66d62fbb802d773a446a54520356f Mon Sep 17 00:00:00 2001
+From 636417a9778449d04dfd704b81fac929cd66fb4f Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 4 Jan 2021 12:29:26 +0100
 Subject: haiku: uses libiconv
@@ -76,12 +76,28 @@ index a6e71c2..99d781a 100644
 2.30.0
 
 
-From cc6d7e8dd79cab558eb5299bc0a7aae553e009af Mon Sep 17 00:00:00 2001
+From 43685fa63aea70a177160d1784a5adfb44134b5e Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Thu, 15 Apr 2021 18:54:32 +0200
 Subject: Haiku: fix 7z and 7zr build on x86_64
 
 
+diff --git a/C/hashes/hash.h b/C/hashes/hash.h
+index 3abf275..e3074ef 100644
+--- a/C/hashes/hash.h
++++ b/C/hashes/hash.h
+@@ -39,6 +39,11 @@
+ #define __hash_h__
+ 
+ #include <string.h>
++#ifdef __HAIKU__
++#include <stdint.h>
++#define _UINT32_T_DECLARED
++#define _UINT64_T_DECLARED
++#endif
+ 
+ #include "../7zTypes.h"
+ 
 diff --git a/CPP/Windows/DLL.cpp b/CPP/Windows/DLL.cpp
 index 744af1f..796c7b4 100644
 --- a/CPP/Windows/DLL.cpp