Index: bin/freebsd-version/Makefile
===================================================================
--- bin/freebsd-version/Makefile
+++ bin/freebsd-version/Makefile
@@ -7,7 +7,8 @@
 NEWVERS = ${SRCTOP}/sys/conf/newvers.sh
 
 freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS}
-	eval $$(egrep '^(TYPE|REVISION|BRANCH)=' ${NEWVERS}) ; \
+	exprot VARS_ONLY=t
+	. ${NEWVERS}
 	if ! sed -e "\
 			s/@@TYPE@@/$${TYPE}/g; \
 			s/@@REVISION@@/$${REVISION}/g; \
Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh
+++ sys/conf/newvers.sh
@@ -34,6 +34,7 @@
 
 # Command line options:
 #
+# XXX Add more
 #     -r               Reproducible build.  Do not embed directory names, user
 #                      names, time stamps or other dynamic information into
 #                      the output file.  This is intended to allow two builds
@@ -53,6 +54,84 @@
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
 
+if [ -z "${SYSDIR}" ]; then
+    SYSDIR=$(dirname $0)/..
+fi
+
+RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' ${PARAMFILE:-${SYSDIR}/sys/param.h})
+
+if [ -r "${SYSDIR}/../COPYRIGHT" ]; then
+	year=$(sed -Ee '/^Copyright .* The FreeBSD Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT)
+else
+	year=$(date +%Y)
+fi
+# look for copyright template
+b=share/examples/etc/bsd-style-copyright
+for bsd_copyright in $b ../$b ../../$b ../../../$b /usr/src/$b /usr/$b
+do
+	if [ -r "$bsd_copyright" ]; then
+		COPYRIGHT=$(sed \
+		    -e "s/\[year\]/1992-$year/" \
+		    -e 's/\[your name here\]\.* /The FreeBSD Project./' \
+		    -e 's/\[your name\]\.*/The FreeBSD Project./' \
+		    -e '/\[id for your version control system, if any\]/d' \
+		    $bsd_copyright)
+		break
+	fi
+done
+
+# no copyright found, use a dummy
+if [ -z "$COPYRIGHT" ]; then
+	COPYRIGHT="/*-
+ * Copyright (c) 1992-$year The FreeBSD Project.
+ *
+ */"
+fi
+
+# add newline
+COPYRIGHT="$COPYRIGHT
+"
+
+include_metadata=true
+while getopts crRovV: opt; do
+	case "$opt" in
+	c)
+		echo "$COPYRIGHT"
+		exit 0
+		;;
+	o)
+		VARS_ONLY=t
+		;;
+	r)
+		include_metadata=
+		;;
+	R)
+		if [ -z "${modified}" ]; then
+			include_metadata=
+		fi
+		;;
+	v)
+		# Only put variables that are single lines here.
+		for v in TYPE REVISION BRANCH RELEASE VERSION RELDATE; do
+			eval val=\$${v}
+			echo ${v}=\"${val}\"
+		done
+		exit 0
+		;;
+	V)
+		v=$OPTARG
+		eval val=\$${v}
+		echo ${v}=\"${val}\"
+		exit 0
+		;;
+	esac
+done
+shift $((OPTIND - 1))
+
+# VARS_ONLY means no files should be generated, this is just being
+# included.
+[ -n "$VARS_ONLY" ] && return 0
+
 #
 # findvcs dir
 #	Looks up directory dir at world root and up the filesystem
@@ -103,49 +182,6 @@
 	return 1
 }
 
-
-if [ -z "${SYSDIR}" ]; then
-    SYSDIR=$(dirname $0)/..
-fi
-
-RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' ${PARAMFILE:-${SYSDIR}/sys/param.h})
-
-if [ -r "${SYSDIR}/../COPYRIGHT" ]; then
-	year=$(sed -Ee '/^Copyright .* The FreeBSD Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT)
-else
-	year=$(date +%Y)
-fi
-# look for copyright template
-b=share/examples/etc/bsd-style-copyright
-for bsd_copyright in ../$b ../../$b ../../../$b /usr/src/$b /usr/$b
-do
-	if [ -r "$bsd_copyright" ]; then
-		COPYRIGHT=$(sed \
-		    -e "s/\[year\]/1992-$year/" \
-		    -e 's/\[your name here\]\.* /The FreeBSD Project./' \
-		    -e 's/\[your name\]\.*/The FreeBSD Project./' \
-		    -e '/\[id for your version control system, if any\]/d' \
-		    $bsd_copyright)
-		break
-	fi
-done
-
-# no copyright found, use a dummy
-if [ -z "$COPYRIGHT" ]; then
-	COPYRIGHT="/*-
- * Copyright (c) 1992-$year The FreeBSD Project.
- *
- */"
-fi
-
-# add newline
-COPYRIGHT="$COPYRIGHT
-"
-
-# VARS_ONLY means no files should be generated, this is just being
-# included.
-[ -n "$VARS_ONLY" ] && return 0
-
 LC_ALL=C; export LC_ALL
 if [ ! -r version ]
 then
@@ -275,20 +311,6 @@
 	fi
 fi
 
-include_metadata=true
-while getopts rR opt; do
-	case "$opt" in
-	r)
-		include_metadata=
-		;;
-	R)
-		if [ -z "${modified}" ]; then
-			include_metadata=
-		fi
-	esac
-done
-shift $((OPTIND - 1))
-
 if [ -z "${include_metadata}" ]; then
 	VERINFO="${VERSION}${svn}${git}${hg} ${i}"
 	VERSTR="${VERINFO}\\n"
Index: usr.sbin/amd/include/newvers.sh
===================================================================
--- usr.sbin/amd/include/newvers.sh
+++ usr.sbin/amd/include/newvers.sh
@@ -5,7 +5,8 @@
 #
 
 if [ -e $1 ]; then
-	eval `LC_ALL=C egrep '^[A-Z]+=' $1 | grep -v COPYRIGHT`
+	export VARS_ONLY=t
+	. $1
 	OS=`echo ${TYPE} | LC_ALL=C tr 'A-Z' 'a-z'`
 	echo '/* Define name and version of host machine (eg. solaris2.5.1) */'
 	echo "#define HOST_OS \"${OS}${REVISION}\""