diff --git a/CHANGES b/CHANGES
index 7d9ad12..dc89627 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,8 @@ The following are the changes from calc version 2.14.0.15 to date:
     Added ${MSYS} Makefile variable for users under Windows 11 who
     use MINGW64_NT.
 
+    Fixed missing quotes in the PASSDOWN makefile variables.
+
 
 The following are the changes from calc version 2.14.0.14 to 2.14.0.14:
 
diff --git a/Makefile b/Makefile
index 5b49b7d..7f59f49 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,6 @@ endif
 #
 #endif	/* end of skip for non-Gnu makefiles */
 
-
 ##############################################################################
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
 ##############################################################################
@@ -2152,14 +2151,14 @@ SAMPLE_OBJ= sample_many.o sample_rand.o
 #
 CUSTOM_PASSDOWN=  \
     ALLOW_CUSTOM="${ALLOW_CUSTOM}" \
-    AR=${AR} \
-    ARCH_CFLAGS=${ARCH_CFLAGS} \
-    AWK=${AWK} \
+    AR="${AR}" \
+    ARCH_CFLAGS="${ARCH_CFLAGS}" \
+    AWK="${AWK}" \
     BINDIR="${BINDIR}" \
     BLD_TYPE="${BLD_TYPE}" \
     CALC_INCDIR="${CALC_INCDIR}" \
     CALC_SHAREDIR="${CALC_SHAREDIR}" \
-    CAT=${CAT} \
+    CAT="${CAT}" \
     CC="${CC}" \
     CCBAN="${CCBAN}" \
     CCERR="${CCERR}" \
@@ -2168,13 +2167,13 @@ CUSTOM_PASSDOWN=  \
     CCWARN="${CCWARN}" \
     CC_SHARE="${CC_SHARE}" \
     CFLAGS="${CFLAGS} -I.." \
-    CHMOD=${CHMOD} \
-    CMP=${CMP} \
-    CO=${CO} \
+    CHMOD="${CHMOD}" \
+    CMP="${CMP}" \
+    CO="${CO}" \
     COMMON_ADD="${COMMON_ADD}" \
     COMMON_CFLAGS="${COMMON_CFLAGS} -I.." \
     COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
-    CP=${CP} \
+    CP="${CP}" \
     CUSTOMCALDIR="${CUSTOMCALDIR}" \
     CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
     CUSTOMINCDIR="${CUSTOMINCDIR}" \
@@ -2182,166 +2181,166 @@ CUSTOM_PASSDOWN=  \
     DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \
     DIFF="${DIFF}" \
     E="${E}" \
-    FMT=${FMT} \
-    GREP=${GREP} \
+    FMT="${FMT}" \
+    GREP="${GREP}" \
     H="${H}" \
     HELPDIR="${HELPDIR}" \
     ICFLAGS="${ICFLAGS} -I.." \
     ILDFLAGS="${ILDFLAGS}" \
     INCDIR="${INCDIR}" \
-    LANG=${LANG} \
+    LANG="${LANG}" \
     LCC="${LCC}" \
-    LDCONFIG=${LDCONFIG} \
+    LDCONFIG="${LDCONFIG}" \
     LDFLAGS="${LDFLAGS}" \
     LD_SHARE="${LD_SHARE}" \
     LIBCUSTCALC_SHLIB="${LIBCUSTCALC_SHLIB}" \
     LIBDIR="${LIBDIR}" \
-    LN=${LN} \
-    LS=${LS} \
-    MAKE=${MAKE} \
-    MAKEDEPEND=${MAKEDEPEND} \
+    LN="${LN}" \
+    LS="${LS}" \
+    MAKE="${MAKE}" \
+    MAKEDEPEND="${MAKEDEPEND}" \
     MAKE_FILE=Makefile \
-    MKDIR=${MKDIR} \
-    MV=${MV} \
-    MSYS=${MSYS} \
+    MKDIR="${MKDIR}" \
+    MV="${MV}" \
+    MSYS="${MSYS}" \
     PREFIX="${PREFIX}" \
     PURIFY="${PURIFY}" \
     Q="${Q}" \
     RANLIB="${RANLIB}" \
-    RM=${RM} \
-    RMDIR=${RMDIR} \
+    RM="${RM}" \
+    RMDIR="${RMDIR}" \
     S="${S}" \
     SCRIPTDIR="${SCRIPTDIR}" \
-    SED=${SED} \
-    SHELL=${SHELL} \
-    SORT=${SORT} \
-    T=${T} \
-    TAIL=${TAIL} \
-    TOUCH=${TOUCH} \
-    TRUE=${TRUE} \
-    V=${V} \
-    VERSION=${VERSION} \
-    WNO_IMPLICT=${WNO_IMPLICT} \
-    WNO_ERROR_LONG_LONG=${WNO_ERROR_LONG_LONG} \
-    WNO_LONG_LONG=${WNO_LONG_LONG} \
-    target=${target}
+    SED="${SED}" \
+    SHELL="${SHELL}" \
+    SORT="${SORT}" \
+    T="${T}" \
+    TAIL="${TAIL}" \
+    TOUCH="${TOUCH}" \
+    TRUE="${TRUE}" \
+    V="${V}" \
+    VERSION="${VERSION}" \
+    WNO_IMPLICT="${WNO_IMPLICT}" \
+    WNO_ERROR_LONG_LONG="${WNO_ERROR_LONG_LONG}" \
+    WNO_LONG_LONG="${WNO_LONG_LONG}" \
+    target="${target}"
 
 # The complete list of Makefile vars passed down to help/Makefile.
 #
 HELP_PASSDOWN= \
-    AR=${AR} \
+    AR="${AR}" \
     BINDIR="${BINDIR}" \
     CALC_INCDIR="${CALC_INCDIR}" \
     CALC_SHAREDIR="${CALC_SHAREDIR}" \
-    CAT=${CAT} \
+    CAT="${CAT}" \
     CFLAGS="${CFLAGS}" \
-    CHMOD=${CHMOD} \
-    CMP=${CMP} \
-    CO=${CO} \
+    CHMOD="${CHMOD}" \
+    CMP="${CMP}" \
+    CO="${CO}" \
     COMMON_ADD="${COMMON_ADD}" \
     COMMON_CFLAGS="${COMMON_CFLAGS}" \
     COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
-    CP=${CP} \
+    CP="${CP}" \
     E="${E}" \
-    EXT=${EXT} \
-    FMT=${FMT} \
-    GREP=${GREP} \
+    EXT="${EXT}" \
+    FMT="${FMT}" \
+    GREP="${GREP}" \
     H="${H}" \
     HELPDIR="${HELPDIR}" \
     ICFLAGS="${ICFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
     INCDIR="${INCDIR}" \
-    LANG=${LANG} \
+    LANG="${LANG}" \
     LCC="${LCC}" \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
-    MKDIR=${MKDIR} \
-    MSYS=${MSYS} \
-    MV=${MV} \
+    MKDIR="${MKDIR}" \
+    MSYS="${MSYS}" \
+    MV="${MV}" \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
-    RM=${RM} \
-    RMDIR=${RMDIR} \
+    RM="${RM}" \
+    RMDIR="${RMDIR}" \
     S="${S}" \
     SCRIPTDIR="${SCRIPTDIR}" \
-    SED=${SED} \
-    SHELL=${SHELL} \
-    T=${T} \
-    TOUCH=${TOUCH} \
-    TRUE=${TRUE} \
-    V=${V}
+    SED="${SED}" \
+    SHELL="${SHELL}" \
+    T="${T}" \
+    TOUCH="${TOUCH}" \
+    TRUE="${TRUE}" \
+    V="${V}"
 
 # The complete list of Makefile vars passed down to cal/Makefile.
 #
 CAL_PASSDOWN= \
-    AR=${AR} \
+    AR="${AR}" \
     BINDIR="${BINDIR}" \
     CALC_INCDIR="${CALC_INCDIR}" \
     CALC_SHAREDIR="${CALC_SHAREDIR}" \
-    CAT=${CAT} \
-    CHMOD=${CHMOD} \
-    CMP=${CMP} \
-    CO=${CO} \
-    CP=${CP} \
+    CAT="${CAT}" \
+    CHMOD="${CHMOD}" \
+    CMP="${CMP}" \
+    CO="${CO}" \
+    CP="${CP}" \
     E="${E}" \
     H="${H}" \
     HELPDIR="${HELPDIR}" \
     INCDIR="${INCDIR}" \
-    LANG=${LANG} \
+    LANG="${LANG}" \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
-    MKDIR=${MKDIR} \
-    MSYS=${MSYS} \
-    MV=${MV} \
+    MKDIR="${MKDIR}" \
+    MSYS="${MSYS}" \
+    MV="${MV}" \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
-    RM=${RM} \
-    RMDIR=${RMDIR} \
+    RM="${RM}" \
+    RMDIR="${RMDIR}" \
     S="${S}" \
     SCRIPTDIR="${SCRIPTDIR}" \
-    SHELL=${SHELL} \
-    T=${T} \
-    TOUCH=${TOUCH} \
-    TRUE=${TRUE} \
-    V=${V}
+    SHELL="${SHELL}" \
+    T="${T}" \
+    TOUCH="${TOUCH}" \
+    TRUE="${TRUE}" \
+    V="${V}"
 
 # The complete list of Makefile vars passed down to cscript/Makefile.
 #
 CSCRIPT_PASSDOWN= \
-    AR=${AR} \
+    AR="${AR}" \
     BINDIR="${BINDIR}" \
     CALC_INCDIR="${CALC_INCDIR}" \
     CALC_SHAREDIR="${CALC_SHAREDIR}" \
-    CAT=${CAT} \
-    CHMOD=${CHMOD} \
-    CMP=${CMP} \
-    CO=${CO} \
-    CP=${CP} \
+    CAT="${CAT}" \
+    CHMOD="${CHMOD}" \
+    CMP="${CMP}" \
+    CO="${CO}" \
+    CP="${CP}" \
     E="${E}" \
     ECHON="${ECHON}" \
-    FMT=${FMT} \
+    FMT="${FMT}" \
     H="${H}" \
     HELPDIR="${HELPDIR}" \
     INCDIR="${INCDIR}" \
-    LANG=${LANG} \
+    LANG="${LANG}" \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
-    MKDIR=${MKDIR} \
-    MSYS=${MSYS} \
-    MV=${MV} \
+    MKDIR="${MKDIR}" \
+    MSYS="${MSYS}" \
+    MV="${MV}" \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
-    RM=${RM} \
-    RMDIR=${RMDIR} \
+    RM="${RM}" \
+    RMDIR="${RMDIR}" \
     S="${S}" \
     SCRIPTDIR="${SCRIPTDIR}" \
-    SED=${SED} \
-    SHELL=${SHELL} \
-    SORT=${SORT} \
-    T=${T} \
-    TOUCH=${TOUCH} \
-    TRUE=${TRUE} \
-    V=${V}
+    SED="${SED}" \
+    SHELL="${SHELL}" \
+    SORT="${SORT}" \
+    T="${T}" \
+    TOUCH="${TOUCH}" \
+    TRUE="${TRUE}" \
+    V="${V}"
 
 # complete list of .h files found (but not built) in the distribution
 #
@@ -4877,6 +4876,7 @@ env:
 	@echo 'MANMAKE=${MANMAKE}'; echo ''
 	@echo 'MANMODE=${MANMODE}'; echo ''
 	@echo 'MKDIR=${MKDIR}'; echo ''
+	@echo 'MSYS=${MSYS}'; echo ''
 	@echo 'MV=${MV}'; echo ''
 	@echo 'NROFF=${NROFF}'; echo ''
 	@echo 'NROFF_ARG=${NROFF_ARG}'; echo ''
diff --git a/Makefile.simple b/Makefile.simple
index eb8ca27..2ee96ec 100644
--- a/Makefile.simple
+++ b/Makefile.simple
@@ -58,7 +58,6 @@
 SHELL= /bin/bash
 #SHELL= /bin/sh
 
-
 ##############################################################################
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
 ##############################################################################
@@ -1564,14 +1563,14 @@ SAMPLE_OBJ= sample_many.o sample_rand.o
 #
 CUSTOM_PASSDOWN=  \
     ALLOW_CUSTOM="${ALLOW_CUSTOM}" \
-    AR=${AR} \
-    ARCH_CFLAGS=${ARCH_CFLAGS} \
-    AWK=${AWK} \
+    AR="${AR}" \
+    ARCH_CFLAGS="${ARCH_CFLAGS}" \
+    AWK="${AWK}" \
     BINDIR="${BINDIR}" \
     BLD_TYPE="${BLD_TYPE}" \
     CALC_INCDIR="${CALC_INCDIR}" \
     CALC_SHAREDIR="${CALC_SHAREDIR}" \
-    CAT=${CAT} \
+    CAT="${CAT}" \
     CC="${CC}" \
     CCBAN="${CCBAN}" \
     CCERR="${CCERR}" \
@@ -1580,13 +1579,13 @@ CUSTOM_PASSDOWN=  \
     CCWARN="${CCWARN}" \
     CC_SHARE="${CC_SHARE}" \
     CFLAGS="${CFLAGS} -I.." \
-    CHMOD=${CHMOD} \
-    CMP=${CMP} \
-    CO=${CO} \
+    CHMOD="${CHMOD}" \
+    CMP="${CMP}" \
+    CO="${CO}" \
     COMMON_ADD="${COMMON_ADD}" \
     COMMON_CFLAGS="${COMMON_CFLAGS} -I.." \
     COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
-    CP=${CP} \
+    CP="${CP}" \
     CUSTOMCALDIR="${CUSTOMCALDIR}" \
     CUSTOMHELPDIR="${CUSTOMHELPDIR}" \
     CUSTOMINCDIR="${CUSTOMINCDIR}" \
@@ -1594,166 +1593,166 @@ CUSTOM_PASSDOWN=  \
     DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \
     DIFF="${DIFF}" \
     E="${E}" \
-    FMT=${FMT} \
-    GREP=${GREP} \
+    FMT="${FMT}" \
+    GREP="${GREP}" \
     H="${H}" \
     HELPDIR="${HELPDIR}" \
     ICFLAGS="${ICFLAGS} -I.." \
     ILDFLAGS="${ILDFLAGS}" \
     INCDIR="${INCDIR}" \
-    LANG=${LANG} \
+    LANG="${LANG}" \
     LCC="${LCC}" \
-    LDCONFIG=${LDCONFIG} \
+    LDCONFIG="${LDCONFIG}" \
     LDFLAGS="${LDFLAGS}" \
     LD_SHARE="${LD_SHARE}" \
     LIBCUSTCALC_SHLIB="${LIBCUSTCALC_SHLIB}" \
     LIBDIR="${LIBDIR}" \
-    LN=${LN} \
-    LS=${LS} \
-    MAKE=${MAKE} \
-    MAKEDEPEND=${MAKEDEPEND} \
+    LN="${LN}" \
+    LS="${LS}" \
+    MAKE="${MAKE}" \
+    MAKEDEPEND="${MAKEDEPEND}" \
     MAKE_FILE=Makefile \
-    MKDIR=${MKDIR} \
-    MV=${MV} \
-    MSYS=${MSYS} \
+    MKDIR="${MKDIR}" \
+    MV="${MV}" \
+    MSYS="${MSYS}" \
     PREFIX="${PREFIX}" \
     PURIFY="${PURIFY}" \
     Q="${Q}" \
     RANLIB="${RANLIB}" \
-    RM=${RM} \
-    RMDIR=${RMDIR} \
+    RM="${RM}" \
+    RMDIR="${RMDIR}" \
     S="${S}" \
     SCRIPTDIR="${SCRIPTDIR}" \
-    SED=${SED} \
-    SHELL=${SHELL} \
-    SORT=${SORT} \
-    T=${T} \
-    TAIL=${TAIL} \
-    TOUCH=${TOUCH} \
-    TRUE=${TRUE} \
-    V=${V} \
-    VERSION=${VERSION} \
-    WNO_IMPLICT=${WNO_IMPLICT} \
-    WNO_ERROR_LONG_LONG=${WNO_ERROR_LONG_LONG} \
-    WNO_LONG_LONG=${WNO_LONG_LONG} \
-    target=${target}
+    SED="${SED}" \
+    SHELL="${SHELL}" \
+    SORT="${SORT}" \
+    T="${T}" \
+    TAIL="${TAIL}" \
+    TOUCH="${TOUCH}" \
+    TRUE="${TRUE}" \
+    V="${V}" \
+    VERSION="${VERSION}" \
+    WNO_IMPLICT="${WNO_IMPLICT}" \
+    WNO_ERROR_LONG_LONG="${WNO_ERROR_LONG_LONG}" \
+    WNO_LONG_LONG="${WNO_LONG_LONG}" \
+    target="${target}"
 
 # The complete list of Makefile vars passed down to help/Makefile.
 #
 HELP_PASSDOWN= \
-    AR=${AR} \
+    AR="${AR}" \
     BINDIR="${BINDIR}" \
     CALC_INCDIR="${CALC_INCDIR}" \
     CALC_SHAREDIR="${CALC_SHAREDIR}" \
-    CAT=${CAT} \
+    CAT="${CAT}" \
     CFLAGS="${CFLAGS}" \
-    CHMOD=${CHMOD} \
-    CMP=${CMP} \
-    CO=${CO} \
+    CHMOD="${CHMOD}" \
+    CMP="${CMP}" \
+    CO="${CO}" \
     COMMON_ADD="${COMMON_ADD}" \
     COMMON_CFLAGS="${COMMON_CFLAGS}" \
     COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
-    CP=${CP} \
+    CP="${CP}" \
     E="${E}" \
-    EXT=${EXT} \
-    FMT=${FMT} \
-    GREP=${GREP} \
+    EXT="${EXT}" \
+    FMT="${FMT}" \
+    GREP="${GREP}" \
     H="${H}" \
     HELPDIR="${HELPDIR}" \
     ICFLAGS="${ICFLAGS}" \
     ILDFLAGS="${ILDFLAGS}" \
     INCDIR="${INCDIR}" \
-    LANG=${LANG} \
+    LANG="${LANG}" \
     LCC="${LCC}" \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
-    MKDIR=${MKDIR} \
-    MSYS=${MSYS} \
-    MV=${MV} \
+    MKDIR="${MKDIR}" \
+    MSYS="${MSYS}" \
+    MV="${MV}" \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
-    RM=${RM} \
-    RMDIR=${RMDIR} \
+    RM="${RM}" \
+    RMDIR="${RMDIR}" \
     S="${S}" \
     SCRIPTDIR="${SCRIPTDIR}" \
-    SED=${SED} \
-    SHELL=${SHELL} \
-    T=${T} \
-    TOUCH=${TOUCH} \
-    TRUE=${TRUE} \
-    V=${V}
+    SED="${SED}" \
+    SHELL="${SHELL}" \
+    T="${T}" \
+    TOUCH="${TOUCH}" \
+    TRUE="${TRUE}" \
+    V="${V}"
 
 # The complete list of Makefile vars passed down to cal/Makefile.
 #
 CAL_PASSDOWN= \
-    AR=${AR} \
+    AR="${AR}" \
     BINDIR="${BINDIR}" \
     CALC_INCDIR="${CALC_INCDIR}" \
     CALC_SHAREDIR="${CALC_SHAREDIR}" \
-    CAT=${CAT} \
-    CHMOD=${CHMOD} \
-    CMP=${CMP} \
-    CO=${CO} \
-    CP=${CP} \
+    CAT="${CAT}" \
+    CHMOD="${CHMOD}" \
+    CMP="${CMP}" \
+    CO="${CO}" \
+    CP="${CP}" \
     E="${E}" \
     H="${H}" \
     HELPDIR="${HELPDIR}" \
     INCDIR="${INCDIR}" \
-    LANG=${LANG} \
+    LANG="${LANG}" \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
-    MKDIR=${MKDIR} \
-    MSYS=${MSYS} \
-    MV=${MV} \
+    MKDIR="${MKDIR}" \
+    MSYS="${MSYS}" \
+    MV="${MV}" \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
-    RM=${RM} \
-    RMDIR=${RMDIR} \
+    RM="${RM}" \
+    RMDIR="${RMDIR}" \
     S="${S}" \
     SCRIPTDIR="${SCRIPTDIR}" \
-    SHELL=${SHELL} \
-    T=${T} \
-    TOUCH=${TOUCH} \
-    TRUE=${TRUE} \
-    V=${V}
+    SHELL="${SHELL}" \
+    T="${T}" \
+    TOUCH="${TOUCH}" \
+    TRUE="${TRUE}" \
+    V="${V}"
 
 # The complete list of Makefile vars passed down to cscript/Makefile.
 #
 CSCRIPT_PASSDOWN= \
-    AR=${AR} \
+    AR="${AR}" \
     BINDIR="${BINDIR}" \
     CALC_INCDIR="${CALC_INCDIR}" \
     CALC_SHAREDIR="${CALC_SHAREDIR}" \
-    CAT=${CAT} \
-    CHMOD=${CHMOD} \
-    CMP=${CMP} \
-    CO=${CO} \
-    CP=${CP} \
+    CAT="${CAT}" \
+    CHMOD="${CHMOD}" \
+    CMP="${CMP}" \
+    CO="${CO}" \
+    CP="${CP}" \
     E="${E}" \
     ECHON="${ECHON}" \
-    FMT=${FMT} \
+    FMT="${FMT}" \
     H="${H}" \
     HELPDIR="${HELPDIR}" \
     INCDIR="${INCDIR}" \
-    LANG=${LANG} \
+    LANG="${LANG}" \
     LIBDIR="${LIBDIR}" \
     MAKE_FILE=Makefile \
-    MKDIR=${MKDIR} \
-    MSYS=${MSYS} \
-    MV=${MV} \
+    MKDIR="${MKDIR}" \
+    MSYS="${MSYS}" \
+    MV="${MV}" \
     PREFIX="${PREFIX}" \
     Q="${Q}" \
-    RM=${RM} \
-    RMDIR=${RMDIR} \
+    RM="${RM}" \
+    RMDIR="${RMDIR}" \
     S="${S}" \
     SCRIPTDIR="${SCRIPTDIR}" \
-    SED=${SED} \
-    SHELL=${SHELL} \
-    SORT=${SORT} \
-    T=${T} \
-    TOUCH=${TOUCH} \
-    TRUE=${TRUE} \
-    V=${V}
+    SED="${SED}" \
+    SHELL="${SHELL}" \
+    SORT="${SORT}" \
+    T="${T}" \
+    TOUCH="${TOUCH}" \
+    TRUE="${TRUE}" \
+    V="${V}"
 
 # complete list of .h files found (but not built) in the distribution
 #
@@ -4170,6 +4169,7 @@ env:
 	@echo 'MANMAKE=${MANMAKE}'; echo ''
 	@echo 'MANMODE=${MANMODE}'; echo ''
 	@echo 'MKDIR=${MKDIR}'; echo ''
+	@echo 'MSYS=${MSYS}'; echo ''
 	@echo 'MV=${MV}'; echo ''
 	@echo 'NROFF=${NROFF}'; echo ''
 	@echo 'NROFF_ARG=${NROFF_ARG}'; echo ''