diff --git a/crypto/Kconfig b/crypto/Kconfig
index ebe475134edc..8069a58d01f3 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1723,6 +1723,7 @@ config CRYPTO_ZSTD
 	select CRYPTO_ACOMP2
 	select ZSTD_COMPRESS
 	select ZSTD_DECOMPRESS
+	select ZSTD_COMMON
 	help
 	  This is the zstd algorithm.
 
diff --git a/lib/Kconfig b/lib/Kconfig
index d251c8f380fb..79bc5c6e3445 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -256,6 +256,10 @@ config ZSTD_DECOMPRESS
 	select XXHASH
 	tristate
 
+config ZSTD_COMMON
+        select XXHASH
+        tristate
+
 source "lib/xz/Kconfig"
 
 #
diff --git a/lib/Makefile b/lib/Makefile
index e57671483dc2..18cdde0be567 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -144,6 +144,7 @@ obj-$(CONFIG_LZ4HC_COMPRESS) += lz4/
 obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
 obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
 obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
+obj-$(CONFIG_ZSTD_COMMON) += zstd/
 obj-$(CONFIG_XZ_DEC) += xz/
 obj-$(CONFIG_RAID6_PQ) += raid6/