diff --git a/mk/dist.mk b/mk/dist.mk
index 30599b0217d7..718b5bf6df60 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -125,7 +125,7 @@ $(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \
             dist-prepare-win
 	$(CFG_PYTHON) $(S)src/etc/make-win-dist.py tmp/dist/win $(CFG_BUILD)
 	@$(call E, ISCC: $@)
-	$(Q)"$(CFG_ISCC)" $<
+	$(Q)$(CFG_ISCC) $<
 
 $(eval $(call DEF_PREPARE,win))
 
diff --git a/mk/main.mk b/mk/main.mk
index aba02088eabe..3df4d3bfa5ec 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -52,7 +52,7 @@ CFG_GIT_DIR := $(CFG_SRC_DIR).git
 # so we use a hack: define $(SPACE) which contains space character.
 SPACE :=
 SPACE +=
-ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),)
+ifneq ($(CFG_GIT),)
 ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
     CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci')
     CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)