diff --git a/make/apkgs.mk b/make/apkgs.mk
index 7a76bb31a87e014f29edd2f8200d4b012f440c2f..5c5e586bbfa706726046f066423828256abfcc81 100644
--- a/make/apkgs.mk
+++ b/make/apkgs.mk
@@ -4,6 +4,7 @@ APKG_TEST_FILES := $(shell find $(APKG_TEST_DIR) -name '*.py' -o -name '*.yaml'
 CONTENT_FILES := $(shell find content -name '*.yaml' -o -name '*.csv' -o -name '*.apkg' -o -name '*.png')
 
 $(BUILD_PREFIX)apkgs.d.mk: $(filter %/.apkg-spec.yaml,$(CONTENT_FILES)) $(PYTHON_NEEDED)
+	-mkdir -p $(BUILD_PREFIX)
 	echo 'APKGS := \' > $@
 	$(PYTHON) build/export_apkgs.py --dry-run -t no \
 		-c content \
diff --git a/make/changelogs.mk b/make/changelogs.mk
index 23624e1df6e4164d0e04019c33e82bcd226f0d61..3374c60185f15c6606ba62bdc9fde3a5c4f86d42 100644
--- a/make/changelogs.mk
+++ b/make/changelogs.mk
@@ -48,7 +48,7 @@ $(COMBINED_CHANGELOG_MARKDOWN): $(VER_CHANGELOGS_MARKDOWN)
 	cat $(VER_CHANGELOGS_HTML_IN_COMBINED) > $(COMBINED_CHANGELOG_MARKDOWN)
 
 GIT_LOG_FORMAT := \#\# %B
-CHANGELOG_VERSION = $(patsubst $(CACHE_DIR)/CHANGELOG-%.md,%,$@)
+CHANGELOG_VERSION = $(patsubst $(BUILD_PREFIX)CHANGELOG-%.md,%,$@)
 CHANGELOG_GIT_RANGE = $(filter %..$(CHANGELOG_VERSION),$(GIT_VERSION_RANGES))
 $(VER_CHANGELOGS_MARKDOWN): $(GIT_TAG_FILES)
 	@$(and $(BUILD_PREFIX),mkdir -p $(BUILD_PREFIX))