diff --git a/Scripts/GenBuildList b/Scripts/GenBuildList
index df516f6..1fa949c 100755
--- a/Scripts/GenBuildList
+++ b/Scripts/GenBuildList
@@ -19,7 +19,7 @@ source $VMAKEDIR/defsys
 source $VMAKEDIR/functions/functions
 
 for i in `cat $VMAKEDIR/BaseBuild/Basesys/Basesys.dmk|sed -e "/^#/d"|sed -e "/^$/d"|awk '{print $2}'`; do
-	if ! grep -q $i $TMPFILE; then
+	if ! egrep -q "$i$" $TMPFILE; then
 		echo $i >>$TMPFILE
 	fi
 done
@@ -42,7 +42,7 @@ for BuildFile in `cat $VMAKEDIR/SysBuild/DistCluster.dmk|sed -e "/^#/d"|sed -e "
 		if [ "$FLAG" == "0" ] || [ "$FLAG" == "1" ]; then
 			MODNAME=`basename $MODULE`
 			PKGPATH=`egrep "^SRCPATH=" $VMAKEDIR/SysBuild/$MODULE|awk -F"=" '{print $2}'|sed -e "s/^\///"`
-			if grep -q SHNAMELIST $VMAKEDIR/SysBuild/$MODULE; then
+			if grep -q $SHNAMELIST $VMAKEDIR/SysBuild/$MODULE; then
 				SHNAMELIST=`egrep "^SHNAMELIST" $VMAKEDIR/SysBuild/$MODULE|sed -e "s/SHNAMELIST=//"|sed -e "s/\"//g"`
 				for MODNAME in $SHNAMELIST; do
 					echo "Boot $PKGPATH $MODNAME"