diff --git a/configure b/configure
index b63aeda9762..2115b134db3 100755
--- a/configure
+++ b/configure
@@ -86,7 +86,7 @@ putpathvar() {
     else
         printf "configure: %-20s := %s %s\n" $1 "$T" "$2"
     fi
-    printf "%-20s := %q\n" $1 "$T" >>config.tmp
+    printf "%-20s := \"%s\"\n" $1 "$T" >>config.tmp
 }
 
 probe() {
@@ -651,9 +651,9 @@ probe CFG_ADB        adb
 
 if [ ! -z "$CFG_PANDOC" ]
 then
-    PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |
+    PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc\(.exe\)\? ' |
         # extract the first 2 version fields, ignore everything else
-        sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
+        sed 's/pandoc\(.exe\)\? \([0-9]*\)\.\([0-9]*\).*/\2 \3/')
 
     MIN_PV_MAJOR="1"
     MIN_PV_MINOR="9"
diff --git a/mk/reconfig.mk b/mk/reconfig.mk
index 1d800b54a1f..6c14a885b91 100644
--- a/mk/reconfig.mk
+++ b/mk/reconfig.mk
@@ -19,7 +19,7 @@ ifndef CFG_DISABLE_MANAGE_SUBMODULES
 # (nothing checked out at all).  `./configure --{llvm,jemalloc}-root`
 # will explicitly deinitialize the corresponding submodules, and we don't
 # want to force constant rebuilds in that case.
-NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status | grep -c '^+')
+NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && $(CFG_GIT) submodule status | grep -c '^+')
 else
 NEED_GIT_RECONFIG=0
 endif