diff --git a/core/Makefile b/core/Makefile
index 8885172..1d13e7e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1428,6 +1428,8 @@
 $(INSTALLED_USERDATATARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_USERDATAIMAGE_FILES)
 	$(build-userdatatarball-target)
 
+$(call dist-for-goals,userdatatarball,$(INSTALLED_USERDATATARBALL_TARGET))
+
 .PHONY: userdatatarball-nodeps
 userdatatarball-nodeps: $(FS_GET_STATS)
 	$(build-userdatatarball-target)
diff --git a/core/binary.mk b/core/binary.mk
index 8fddbd7..0589de0 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1601,6 +1601,8 @@
   endif
 endif
 
+my_tidy_checks := $(subst $(space),,$(my_tidy_checks))
+
 # Move -l* entries from ldflags to ldlibs, and everything else to ldflags
 my_ldlib_flags := $(my_ldflags) $(my_ldlibs)
 my_ldlibs := $(filter -l%,$(my_ldlib_flags))