diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h
index f721dbca2f..8409f805f7 100755
--- a/build_tools/make_buildopts_h
+++ b/build_tools/make_buildopts_h
@@ -7,7 +7,7 @@ cat << END
  */
 
 END
-TMP=`${GREP} -e ^MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
+TMP=`${GREP} -e "^MENUSELECT_CFLAGS" menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
 for x in ${TMP}; do
 	echo "#define ${x} 1"
 	if test "x${BUILDOPTS}" != "x" ; then
@@ -16,12 +16,12 @@ for x in ${TMP}; do
 		BUILDOPTS="${x}"
 	fi
 done
-TMP=`${GREP} -e ^MENUSELECT_BUILD_DEPS menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
+TMP=`${GREP} -e "^MENUSELECT_BUILD_DEPS" menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
 for x in ${TMP}; do
 	x2=`echo ${x} | tr a-z A-Z`
 	echo "#define AST_MODULE_${x2} 1"
 done
-if ${GREP} AST_DEVMODE makeopts | ${GREP} -q yes
+if ${GREP} "AST_DEVMODE" makeopts | ${GREP} -q "yes"
 then
 	echo "#define AST_DEVMODE 1"
 	TMP="${TMP} AST_DEVMODE"