diff --git a/src/data/package_infos/generic/haiku b/src/data/package_infos/generic/haiku
index 8483512444..5dde375e2d 100644
--- a/src/data/package_infos/generic/haiku
+++ b/src/data/package_infos/generic/haiku
@@ -96,6 +96,9 @@ requires {
 #ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zlib_ENABLED
 	lib:libz
 #endif
+#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zstd_ENABLED
+	lib:libzstd >= 1
+#endif
 
 #ifdef HAIKU_REGULAR_BUILD
 #ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_ffmpeg_ENABLED
@@ -137,8 +140,5 @@ requires {
 #ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_libwebp_ENABLED
 	lib:libwebp
 #endif
-#ifdef HAIKU_BUILD_FEATURE_%HAIKU_PACKAGING_ARCH%_zstd_ENABLED
-	lib:libzstd >= 1
-#endif
 #endif
 }
diff --git a/src/kits/support/Jamfile b/src/kits/support/Jamfile
index afc40985da..4413a33645 100644
--- a/src/kits/support/Jamfile
+++ b/src/kits/support/Jamfile
@@ -19,7 +19,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			UseBuildFeatureHeaders zstd ;
 			Includes [ FGristFiles ZstdCompressionAlgorithm.cpp ]
 				: [ BuildFeatureAttribute zstd : headers ] ;
-			SetupFeatureObjectsDir zstd ;
 		}
 
 		# BUrl uses ICU to perform IDNA conversions (unicode domain names)