diff --git a/src/qtbase.mk b/src/qtbase.mk
index 84e9088e..d13c5be1 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d48482
 $(PKG)_SUBDIR   := $(PKG)-everywhere-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-everywhere-src-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.qt.io/official_releases/qt/5.15/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre2 postgresql sqlite zlib zstd
+$(PKG)_DEPS     := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre2 postgresql sqlite zlib zstd $(BUILD)~zstd
 $(PKG)_DEPS_$(BUILD) :=
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
diff --git a/src/zstd.mk b/src/zstd.mk
index 886323a6..14a3d6fd 100644
--- a/src/zstd.mk
+++ b/src/zstd.mk
@@ -7,10 +7,15 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.4.5
 $(PKG)_CHECKSUM := 734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
 $(PKG)_GH_CONF  := facebook/zstd/tags,v
+$(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS     := cc
 
+$(PKG)_DEPS_$(BUILD) :=
+$(PKG)_OO_DEPS_$(BUILD) := $(MXE_CONF_PKGS)
+
 define $(PKG)_BUILD
     # build and install the library
+    # use cmake to ensure shared builds "do the right thing"
     cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)/build/cmake' \
         -DZSTD_BUILD_STATIC=$(CMAKE_STATIC_BOOL) \
         -DZSTD_BUILD_SHARED=$(CMAKE_SHARED_BOOL) \
@@ -24,3 +29,19 @@ define $(PKG)_BUILD
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         `'$(TARGET)-pkg-config' lib$(PKG) --cflags --libs`
 endef
+
+define $(PKG)_BUILD_$(BUILD)
+    # build and install the library and programs
+    # use make to avoid cmake dependency for gcc10+
+    $(MAKE) -C '$(SOURCE_DIR)/lib' -j '$(JOBS)' V=1 libzstd.a
+    $(MAKE) -C '$(SOURCE_DIR)/lib' -j 1 V=1 \
+        prefix='$(PREFIX)/$(TARGET)' \
+        install-pc \
+        install-static \
+        install-includes
+    $(MAKE) -C '$(SOURCE_DIR)/programs' -j '$(JOBS)' V=1 zstd-release
+    $(MAKE) -C '$(SOURCE_DIR)/programs' -j 1 V=1 \
+        prefix='$(PREFIX)/$(TARGET)' \
+        mandir='$(BUILD_DIR)' \
+        install
+endef