diff --git a/app-arch/zstd/patches/zstd-1.5.0.patchset b/app-arch/zstd/patches/zstd-1.5.0.patchset
new file mode 100644
index 000000000..8dbf1072f
--- /dev/null
+++ b/app-arch/zstd/patches/zstd-1.5.0.patchset
@@ -0,0 +1,22 @@
+From d10c479911497738d482862559b94c7617d57a61 Mon Sep 17 00:00:00 2001
+From: Augustin Cavalier <waddlesplash@gmail.com>
+Date: Wed, 29 Sep 2021 17:58:52 -0400
+Subject: Disable weak symbols; they do not seem to behave correctly.
+
+
+diff --git a/lib/common/zstd_trace.h b/lib/common/zstd_trace.h
+index 2da5640..aeb126a 100644
+--- a/lib/common/zstd_trace.h
++++ b/lib/common/zstd_trace.h
+@@ -20,7 +20,7 @@ extern "C" {
+ /* weak symbol support */
+ #if !defined(ZSTD_HAVE_WEAK_SYMBOLS) && defined(__GNUC__) && \
+     !defined(__APPLE__) && !defined(_WIN32) && !defined(__MINGW32__) && \
+-    !defined(__CYGWIN__)
++    !defined(__CYGWIN__) && !defined(__HAIKU__)
+ #  define ZSTD_HAVE_WEAK_SYMBOLS 1
+ #else
+ #  define ZSTD_HAVE_WEAK_SYMBOLS 0
+-- 
+2.28.0
+
diff --git a/app-arch/zstd/zstd-1.5.0.recipe b/app-arch/zstd/zstd-1.5.0.recipe
index b3a41d523..c178bcb5c 100644
--- a/app-arch/zstd/zstd-1.5.0.recipe
+++ b/app-arch/zstd/zstd-1.5.0.recipe
@@ -11,18 +11,19 @@ HOMEPAGE="https://facebook.github.io/zstd/"
 COPYRIGHT="2016-2018 Facebook, Inc."
 LICENSE="BSD (2-clause)
 	GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/facebook/zstd/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="zstd-$portVersion.tar.gz"
 CHECKSUM_SHA256="0d9ade222c64e912d6957b11c923e214e2e010a18f39bec102f572e693ba2867"
+PATCHES="zstd-$portVersion.patchset"
 if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
 PATCHES="$PATCHES
 	zstd-$portVersion-gcc2.patchset
 	"
 fi
 
-ARCHITECTURES="!all"
-SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
+ARCHITECTURES="all"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir