diff --git a/src/bin/package/Jamfile b/src/bin/package/Jamfile
index 5164fde2d0..7cc2a2dd0a 100644
--- a/src/bin/package/Jamfile
+++ b/src/bin/package/Jamfile
@@ -2,6 +2,10 @@ SubDir HAIKU_TOP src bin package ;
 
 UsePrivateHeaders kernel libroot shared storage support ;
 
+if [ FIsBuildFeatureEnabled zstd ] {
+	SubDirC++Flags -DZSTD_DEFAULT ;
+}
+
 BinCommand package :
 	command_add.cpp
 	command_checksum.cpp
diff --git a/src/bin/package/package.cpp b/src/bin/package/package.cpp
index 61f69f47d7..298497d3b2 100644
--- a/src/bin/package/package.cpp
+++ b/src/bin/package/package.cpp
@@ -131,7 +131,11 @@ parse_compression_argument(const char* arg)
 {
 	if (arg == NULL) {
 		// Default compression method.
+#ifdef ZSTD_DEFAULT
+		return BPackageKit::BHPKG::B_HPKG_COMPRESSION_ZSTD;
+#else
 		return BPackageKit::BHPKG::B_HPKG_COMPRESSION_ZLIB;
+#endif
 	}
 
 	if (strcmp(arg, "zstd") == 0) {
diff --git a/src/tools/package/Jamfile b/src/tools/package/Jamfile
index 32a4b1bf19..9f9c100b53 100644
--- a/src/tools/package/Jamfile
+++ b/src/tools/package/Jamfile
@@ -6,6 +6,10 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin package ] ;
 
 USES_BE_API on <build>package = true ;
 
+if [ FIsBuildFeatureEnabled zstd ] {
+	SubDirC++Flags -DZSTD_DEFAULT ;
+}
+
 BuildPlatformMain <build>package :
 	command_add.cpp
 	command_checksum.cpp