diff --git a/contrib/src/cargo/rules.mak b/contrib/src/cargo/rules.mak
index f4c97ae3d9..7b6b818c7a 100644
--- a/contrib/src/cargo/rules.mak
+++ b/contrib/src/cargo/rules.mak
@@ -5,6 +5,8 @@ CARGOC_VERSION=0.9.29
 RUSTUP_VERSION=1.25.1
 RUSTUP_URL=$(GITHUB)/rust-lang/rustup/archive/$(RUSTUP_VERSION).tar.gz
 
+PKGS_ALL += rustup
+
 RUSTUP = . $(CARGO_HOME)/env && \
 	RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) rustup
 
diff --git a/contrib/src/main-rust.mak b/contrib/src/main-rust.mak
index cabc1cd77e..8dd6249c4b 100644
--- a/contrib/src/main-rust.mak
+++ b/contrib/src/main-rust.mak
@@ -108,12 +108,10 @@ download_vendor = \
 		  mv $(patsubst %.tar.bz2,%,$(notdir $(f))) $(patsubst .%,%,$@))
 	touch $@
 
-CARGO_VENDOR_SETUP = \
-	if test -d $@-vendor; then \
-		mkdir -p $(UNPACK_DIR)/.cargo; \
-		echo "[source.crates-io]" > $(UNPACK_DIR)/.cargo/config.toml; \
-		echo "replace-with = \"vendored-sources\"" >> $(UNPACK_DIR)/.cargo/config.toml; \
-		echo "[source.vendored-sources]" >> $(UNPACK_DIR)/.cargo/config.toml; \
-		echo "directory = \"../$@-vendor\"" >> $(UNPACK_DIR)/.cargo/config.toml; \
-		echo "Using cargo vendor archive for $(UNPACK_DIR)"; \
-	fi;
+cargo_vendor_setup = \
+	mkdir -p $1/.cargo; \
+	echo "[source.crates-io]" > $1/.cargo/config.toml; \
+	echo "replace-with = \"vendored-sources\"" >> $1/.cargo/config.toml; \
+	echo "[source.vendored-sources]" >> $1/.cargo/config.toml; \
+	echo "directory = \"../$2-vendor/vendor\"" >> $1/.cargo/config.toml; \
+	echo "Using cargo vendor archive for $2";
diff --git a/contrib/src/rav1e-vendor/SHA512SUMS b/contrib/src/rav1e-vendor/SHA512SUMS
deleted file mode 100644
index 4f36e4442a..0000000000
--- a/contrib/src/rav1e-vendor/SHA512SUMS
+++ /dev/null
@@ -1 +0,0 @@
-33527a381fe402fc7372ad853d0fb3a15c9ea0be45ff288c41621a979f97967d187f3694f2e2cb2f84af774bbf444ae2d2e22ce3237d76e427b746b03602afc8  rav1e-0.3.4-vendor.tar.bz2
diff --git a/contrib/src/rav1e-vendor/rules.mak b/contrib/src/rav1e-vendor/rules.mak
index 394abb0fa7..939de3769b 100644
--- a/contrib/src/rav1e-vendor/rules.mak
+++ b/contrib/src/rav1e-vendor/rules.mak
@@ -3,4 +3,7 @@
 $(TARBALLS)/rav1e-$(RAV1E_VERSION)-vendor.tar.bz2:
 	$(call download_vendor,rav1e-$(RAV1E_VERSION)-vendor.tar.bz2,rav1e)
 
+.sum-rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2
+	touch $@
+
 .rav1e-vendor: rav1e-$(RAV1E_VERSION)-vendor.tar.bz2
diff --git a/contrib/src/rav1e/rules.mak b/contrib/src/rav1e/rules.mak
index 98448b1eb7..ce6f386237 100644
--- a/contrib/src/rav1e/rules.mak
+++ b/contrib/src/rav1e/rules.mak
@@ -23,14 +23,16 @@ $(TARBALLS)/rav1e-$(RAV1E_VERSION).tar.gz:
 
 RAV1E_FEATURES=--features=asm
 
-rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e .rav1e-vendor
+DEPS_rav1e = rav1e-vendor $(DEPS_rav1e-vendor)
+
+rav1e: rav1e-$(RAV1E_VERSION).tar.gz .sum-rav1e
 	$(UNPACK)
 ifdef HAVE_WIN32
 ifndef HAVE_WIN64
 	$(APPLY) $(SRC)/rav1e/unwind-resume-stub.patch
 endif
 endif
-	$(CARGO_VENDOR_SETUP)
+	$(call cargo_vendor_setup,$(UNPACK_DIR),$@)
 	$(MOVE)
 
 .rav1e: rav1e .cargo