diff --git a/packages/libzstd/Containerfile b/packages/zstd/Containerfile
similarity index 84%
rename from packages/libzstd/Containerfile
rename to packages/zstd/Containerfile
index 508090c..36badb7 100644
--- a/packages/libzstd/Containerfile
+++ b/packages/zstd/Containerfile
@@ -70,5 +70,12 @@ EOF
 FROM build as install
 RUN --network=none DESTDIR=/rootfs meson install --no-rebuild -C output
 
-FROM stagex/filesystem as package
+FROM stagex/filesystem as package-lib
+COPY --from=install /rootfs/usr/lib /usr/lib
+COPY --from=install /rootfs/usr/libexec /usr/libexec
+COPY --from=install /rootfs/usr/include /usr/include
+COPY --from=install /rootfs/usr/share /usr/share
+COPY --from=install /rootfs/var/lib /var/lib
+
+FROM stagex/filesystem as package-bin
 COPY --from=install /rootfs/. /
diff --git a/src/packages.mk b/src/packages.mk
index dec1f0e..d1013af 100644
--- a/src/packages.mk
+++ b/src/packages.mk
@@ -427,7 +427,7 @@ out/elfutils/index.json: \
 	out/gcc/index.json \
 	out/gettext/index.json \
 	out/libtool/index.json \
-	out/libzstd/index.json \
+	out/zstd/index.json \
 	out/linux-headers/index.json \
 	out/m4/index.json \
 	out/make/index.json \
@@ -1050,7 +1050,7 @@ out/libxslt/index.json: \
 .PHONY: libzstd
 libzstd: out/libzstd/index.json
 out/libzstd/index.json: \
-	packages/libzstd/Containerfile \
+	packages/zstd/Containerfile \
 	out/binutils/index.json \
 	out/busybox/index.json \
 	out/filesystem/index.json \
@@ -1061,7 +1061,7 @@ out/libzstd/index.json: \
 	out/pkgconf/index.json \
 	out/python/index.json \
 	out/zlib/index.json
-	$(call build,libzstd)
+	$(call build,zstd,,package-lib)
 
 .PHONY: linux-airgap
 linux-airgap: out/linux-airgap/index.json
@@ -1081,7 +1081,7 @@ out/linux-airgap/index.json: \
 	out/gcc/index.json \
 	out/grep/index.json \
 	out/gzip/index.json \
-	out/libzstd/index.json \
+	out/zstd/index.json \
 	out/linux-headers/index.json \
 	out/m4/index.json \
 	out/make/index.json \
@@ -1113,7 +1113,7 @@ out/linux-generic/index.json: \
 	out/gcc/index.json \
 	out/grep/index.json \
 	out/gzip/index.json \
-	out/libzstd/index.json \
+	out/zstd/index.json \
 	out/linux-headers/index.json \
 	out/m4/index.json \
 	out/make/index.json \
@@ -1153,7 +1153,7 @@ out/linux-nitro/index.json: \
 	out/gcc/index.json \
 	out/grep/index.json \
 	out/gzip/index.json \
-	out/libzstd/index.json \
+	out/zstd/index.json \
 	out/linux-headers/index.json \
 	out/m4/index.json \
 	out/make/index.json \
@@ -2511,7 +2511,7 @@ out/zig/index.json: \
 	out/cmake/index.json \
 	out/filesystem/index.json \
 	out/gcc/index.json \
-	out/libzstd/index.json \
+	out/zstd/index.json \
 	out/lld/index.json \
 	out/llvm/index.json \
 	out/make/index.json \
@@ -2545,3 +2545,18 @@ out/zlib/index.json: \
 	out/musl/index.json
 	$(call build,zlib)
 
+.PHONY: zstd
+zstd: out/zstd/index.json
+out/zstd/index.json: \
+	packages/zstd/Containerfile \
+	out/binutils/index.json \
+	out/busybox/index.json \
+	out/filesystem/index.json \
+	out/gcc/index.json \
+	out/meson/index.json \
+	out/musl/index.json \
+	out/ninja/index.json \
+	out/pkgconf/index.json \
+	out/python/index.json \
+	out/zlib/index.json
+	$(call build,zstd,,package-lib)