diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh
index 906b70645151..eaf3694c2b1e 100755
--- a/usr.bin/grep/tests/grep_freebsd_test.sh
+++ b/usr.bin/grep/tests/grep_freebsd_test.sh
@@ -1,127 +1,137 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 #
 # Copyright (c) 2017 Kyle Evans <kevans@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 
 # What grep(1) are we working with?
 # - 0 : bsdgrep
 # - 1 : gnu grep (ports)
 GREP_TYPE_BSD=0
 GREP_TYPE_GNU=1
 
 grep_type()
 {
 	local grep_version=$(grep --version)
 
 	case "$grep_version" in
 	*"BSD grep"*)
 		return $GREP_TYPE_BSD
 		;;
 	*"GNU grep"*)
 		return $GREP_TYPE_GNU
 		;;
 	esac
 	atf_fail "unknown grep type: $grep_version"
 }
 
 atf_test_case grep_r_implied
 grep_r_implied_body()
 {
 	grep_type
 	if [ $? -ne $GREP_TYPE_BSD ]; then
 		atf_skip "this test only works with bsdgrep(1)"
 	fi
 
 	(cd "$(atf_get_srcdir)" && grep -r --exclude="*.out" -e "test" .) > d_grep_r_implied.out
 
 	atf_check -s exit:0 -x \
 	    "(cd $(atf_get_srcdir) && grep -r --exclude=\"*.out\" -e \"test\") | diff d_grep_r_implied.out -"
 }
 
 atf_test_case rgrep
 rgrep_head()
 {
 	atf_set "require.progs" "rgrep"
 }
 rgrep_body()
 {
 	atf_check -o save:d_grep_r_implied.out grep -r --exclude="*.out" -e "test" "$(atf_get_srcdir)"
 	atf_check -o file:d_grep_r_implied.out rgrep --exclude="*.out" -e "test" "$(atf_get_srcdir)"
 }
 
 atf_test_case gnuext
 gnuext_body()
 {
 	grep_type
 	_type=$?
 
 	atf_check -o save:grep_alnum.out grep -o '[[:alnum:]]' /COPYRIGHT
 	atf_check -o file:grep_alnum.out grep -o '\w' /COPYRIGHT
 
 	atf_check -o save:grep_nalnum.out grep -o '[^[:alnum:]]' /COPYRIGHT
 	atf_check -o file:grep_nalnum.out grep -o '\W' /COPYRIGHT
 
 	atf_check -o save:grep_space.out grep -o '[[:space:]]' /COPYRIGHT
 	atf_check -o file:grep_space.out grep -o '\s' /COPYRIGHT
 
 	atf_check -o save:grep_nspace.out grep -o '[^[:space:]]' /COPYRIGHT
 	atf_check -o file:grep_nspace.out grep -o '\S' /COPYRIGHT
 
 }
 
 atf_test_case zflag
 zflag_body()
 {
 
 	# The -z flag should pick up 'foo' and 'bar' as on the same line with
 	# 'some kind of junk' in between; a bug was present that instead made
 	# it process this incorrectly.
 	printf "foo\nbar\0" > in
 
 	atf_check grep -qz "foo.*bar" in
 }
 
 atf_test_case color_dupe
 color_dupe_body()
 {
 
 	# This assumes a MAX_MATCHES of exactly 32.  Previously buggy procline()
 	# calls would terminate the line premature every MAX_MATCHES matches,
 	# meaning we'd see the line be output again for the next MAX_MATCHES
 	# number of matches.
 	jot -nb 'A' -s '' 33 > in
 
 	atf_check -o save:color.out grep --color=always . in
 	atf_check -o match:"^ +1 color.out" wc -l color.out
 }
 
+atf_test_case qflag
+qflag_body()
+{
+	# Test whitespace in argument
+	printf "1 2 3 4\n5 6 7 8\n" > in
+
+	atf_check zgrep -q '1 2' in
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case grep_r_implied
 	atf_add_test_case rgrep
 	atf_add_test_case gnuext
 	atf_add_test_case zflag
 	atf_add_test_case color_dupe
+	atf_add_test_case qflag
 }
diff --git a/usr.bin/grep/zgrep.sh b/usr.bin/grep/zgrep.sh
index 8bd630726647..474f3868db9d 100755
--- a/usr.bin/grep/zgrep.sh
+++ b/usr.bin/grep/zgrep.sh
@@ -1,230 +1,230 @@
 #!/bin/sh
 #
 # Copyright (c) 2003 Thomas Klausner.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
 set -u
 grep=grep
 zcat=zstdcat
 
 endofopts=0
 pattern_file=0
 pattern_found=0
 grep_args=""
 hyphen=0
 silent=0
 
 prg=${0##*/}
 
 # handle being called 'zegrep' or 'zfgrep'
 case ${prg} in
 *egrep)
 	grep_args="-E";;
 *fgrep)
 	grep_args="-F";;
 esac
 
 catargs="-f"
 case ${prg} in
 zstd*)
 	cattool="/usr/bin/zstdcat"
 	catargs="-fq"
 	;;
 bz*)
 	cattool="/usr/bin/bzcat"
 	;;
 z*)
 	cattool="/usr/bin/zcat"
 	;;
 xz*)
 	cattool="/usr/bin/xzcat"
 	;;
 lz*)
 	cattool="/usr/bin/lzcat"
 	;;
 *)
 	echo "Invalid command: ${prg}" >&2
 	exit 1
 	;;
 esac
 
 # skip all options and pass them on to grep taking care of options
 # with arguments, and if -e was supplied
 
 while [ $# -gt 0 -a ${endofopts} -eq 0 ]
 do
     case $1 in
     # from GNU grep-2.6.0 -- keep in sync!
 	--)
 	    shift
 	    endofopts=1
 	    ;;
 	--file=*)
 	    pattern_file=1
 	    grep_args="${grep_args} ${1}"
 	    shift
 	    ;;
 	--regexp=*)
 	    if [ ${pattern_found} -ne 0 ]; then
 		grep_args="${grep_args} -e ${pattern}"
 	    fi
 	    pattern="${1#--regexp=}"
 	    pattern_found=1
 	    shift
 	    ;;
 	-h|--no-filename)
 	    silent=1
 	    shift
 	    ;;
 	-V|--version)
 	    exec ${grep} -V
 	    ;;
 	--*)
 	    grep_args="${grep_args} $1"
 	    shift
 	    ;;
 	-[EFGHILOSUVabchilnopqsuvwxyz]*)
 	    post="${1#-?}"
 	    pre=${1%${post}}
 	    grep_args="${grep_args} ${pre}"
 	    shift
 	    # Put back partial arg
-	    set -- "-${post}" $*
+	    set -- "-${post}" "$@"
 	    ;;
 	-[ABCDdefm])
 	    if [ $# -lt 2 ]
 		then
 		echo "${prg}: missing argument for $1 flag" >&2
 		exit 1
 	    fi
 	    case $1 in
 		-e)
 		    if [ ${pattern_found} -ne 0 ]; then
 			grep_args="${grep_args} -e ${pattern}"
 		    fi
 		    pattern="$2"
 		    pattern_found=1
 		    shift 2
 		    continue
 		    ;;
 		-f)
 		    pattern_file=1
 		    ;;
 		*)
 		    ;;
 	    esac
 	    grep_args="${grep_args} $1 $2"
 	    shift 2
 	    ;;
 	-[ABCDdefm]*)
 	    post="${1#-e}"
 	    case ${1} in
 		-e*)
 		    if [ ${pattern_found} -ne 0 ]; then
 			grep_args="${grep_args} -e ${pattern}"
 		    fi
 		    pattern="${post}"
 		    pattern_found=1
 		    shift
 		    continue
 		    ;;
 		-f*)
 		    pattern_file=1
 		    ;;
 		*)
 		    ;;
 	    esac
 	    grep_args="${grep_args} ${post}"
 	    shift
 	    ;;
 	-)
 	    hyphen=1
 	    shift
 	    ;;
 	-r|-R)
 	    echo "${prg}: the ${1} flag is not currently supported" >&2
 	    exit 1
 	    ;;
 	-?)
 	    grep_args="${grep_args} $1"
 	    shift
 	    ;;
 	*)
 	    # pattern to grep for
 	    endofopts=1
 	    ;;
     esac
 done
 
 # if no -e option was found, take next argument as grep-pattern
 if [ ${pattern_file} -eq 0 -a ${pattern_found} -eq 0 ]
 then
     if [ $# -ge 1 ]; then
 	pattern="$1"
 	shift
     elif [ ${hyphen} -gt 0 ]; then
 	pattern="-"
     else
 	echo "${prg}: missing pattern" >&2
 	exit 1
     fi
     pattern_found=1
 fi
 
 # Clean up possible leading blank
 grep_args="${grep_args# }"
 
 # call grep ...
 if [ $# -lt 1 ]
 then
     # ... on stdin
     if [ ${pattern_file} -eq 0 ]; then
 	${cattool} ${catargs} - | ${grep} ${grep_args} -e "${pattern}" -- -
     else
 	${cattool} ${catargs} - | ${grep} ${grep_args} -- -
     fi
     ret=$?
 else
     # ... on all files given on the command line
     if [ ${silent} -lt 1 -a $# -gt 1 ]; then
 	grep_args="-H ${grep_args}"
     fi
     # Succeed if any file matches.  First assume no match.
     ret=1
     for file; do
 	if [ ${pattern_file} -eq 0 ]; then
 	    ${cattool} ${catargs} -- "${file}" |
 		${grep} --label="${file}" ${grep_args} -e "${pattern}" -- -
 	else
 	    ${cattool} ${catargs} -- "${file}" |
 		${grep} --label="${file}" ${grep_args} -- -
 	fi
 	this_ret=$?
 	# A match (0) overrides a no-match (1).  An error (>=2) overrides all.
 	if [ ${this_ret} -eq 0 -a ${ret} -eq 1 ] || [ ${this_ret} -ge 2 ]; then
 	    ret=${this_ret}
 	fi
     done
 fi
 
 exit ${ret}