diff --git a/Mk/Scripts/create-manifest.sh b/Mk/Scripts/create-manifest.sh
index 2f68f0e9d436..c6d0ef559195 100644
--- a/Mk/Scripts/create-manifest.sh
+++ b/Mk/Scripts/create-manifest.sh
@@ -1,175 +1,177 @@
 #!/bin/sh
 #
 # MAINTAINER: portmgr@FreeBSD.org
 
 set -e
 set -o pipefail
 
 . "${dp_SCRIPTSDIR}/functions.sh"
 
 validate_env dp_ACTUAL_PACKAGE_DEPENDS dp_CATEGORIES dp_COMMENT \
 	dp_COMPLETE_OPTIONS_LIST dp_DEPRECATED dp_DESCR dp_EXPIRATION_DATE \
 	dp_GROUPS dp_LICENSE dp_LICENSE_COMB dp_MAINTAINER dp_METADIR \
 	dp_NO_ARCH dp_PKGBASE dp_PKGDEINSTALL dp_PKGINSTALL dp_PKGMESSAGES \
 	dp_PKGORIGIN dp_PKGPOSTDEINSTALL dp_PKGPOSTINSTALL dp_PKGPREDEINSTALL \
 	dp_PKGPREINSTALL dp_PKGVERSION dp_PKG_BIN dp_PKG_IGNORE_DEPENDS \
 	dp_PKG_NOTES dp_PORT_OPTIONS dp_PREFIX dp_USERS dp_WWW
 
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_CREATE_MANIFEST}" ] && set -x
 
 set -u
 
 listcontains() {
 	local str lst elt
 	str=$1
 	lst=$2
 
 	for elt in ${lst} ; do
 		if [ ${elt} = ${str} ]; then
 			return 0
 		fi
 	done
 	return 1
 }
 
 mkdir -p ${dp_METADIR}
 
 # Save stdout and redirect it to the manifest file.
 exec 3>&1 >${dp_METADIR}/+MANIFEST
 
 # First, all the required bits
 cat <<EOT
 name: "${dp_PKGBASE}"
 version: "${dp_PKGVERSION}"
 origin: ${dp_PKGORIGIN}
 comment: <<EOD
 ${dp_COMMENT}
 EOD
 maintainer: ${dp_MAINTAINER}
 prefix: ${dp_PREFIX}
 categories: [ ${dp_CATEGORIES} ]
 licenselogic: ${dp_LICENSE_COMB:-single}
 EOT
 
 # Then, the optional bits
 [ -z "${dp_WWW}" ] || echo "www: \"${dp_WWW%% *}\""
 [ -z "${dp_LICENSE}" ] || echo "licenses: [ ${dp_LICENSE} ]"
 [ -z "${dp_USERS}" ] || echo "users: [ ${dp_USERS} ]"
 [ -z "${dp_GROUPS}" ] || echo "groups: [ ${dp_GROUPS} ]"
 [ -n "${dp_NO_ARCH}" ] && echo "arch : $(${dp_PKG_BIN} config abi | tr '[:upper:]' '[:lower:]' | cut -d: -f1,2):*"
 [ -n "${dp_NO_ARCH}" ] && echo "abi : $(${dp_PKG_BIN} config abi | cut -d: -f1,2):*"
 
 # Then the key/values sections
 echo "deps: { "
 # Ignore grep's return value.
 eval ${dp_ACTUAL_PACKAGE_DEPENDS} | { grep -v -E ${dp_PKG_IGNORE_DEPENDS} || :; } | sort -u
 echo "}"
 
 echo "options: {"
 for opt in ${dp_COMPLETE_OPTIONS_LIST}; do
 	if listcontains ${opt} "${dp_PORT_OPTIONS}"; then
 		echo " ${opt}: on,"
 	else
 		echo " ${opt}: off,"
 	fi
 done
 echo "}"
 
 if [ -n "${dp_PKG_NOTES}" ]; then
 	echo "annotations: {"
 	for note in ${dp_PKG_NOTES}; do
 		echo " ${note}: <<EOD"
 		eval "echo \"\${dp_PKG_NOTE_${note}}\""
 		echo "EOD"
 	done
 	echo "}"
 fi
 
 # Copy the pkg-descr file
-cp ${dp_DESCR} ${dp_METADIR}/+DESC
-if [ -n "${dp_WWW}" ] && ! grep -q '^WWW: ' ${dp_DESCR}; then
-	echo >> ${dp_METADIR}/+DESC
-	for www in ${dp_WWW}; do
-		echo "WWW: ${www}" >> ${dp_METADIR}/+DESC
-	done
-fi
+{
+	cat ${dp_DESCR}
+	if [ -n "${dp_WWW}" ] && ! grep -q '^WWW: ' ${dp_DESCR}; then
+			echo
+			for www in ${dp_WWW}; do
+				echo "WWW: ${www}"
+			done
+	fi
+} > ${dp_METADIR}/+DESC
 
 # Concatenate all the scripts
 output_files=
 for stage in INSTALL DEINSTALL; do
 	for prepost in '' PRE POST; do
 		output=${dp_METADIR}/+${prepost:+${prepost}_}${stage}
 		[ -f "${output}" ] && output_files="${output_files:+${output_files} }${output}"
 	done
 done
 [ -n "${output_files}" ] && rm -f ${output_files}
 
 for stage in INSTALL DEINSTALL; do
 	for prepost in '' PRE POST; do
 		eval files="\${dp_PKG${prepost}${stage}}"
 		output=${dp_METADIR}/+${prepost:+${prepost}_}${stage}
 		for input in ${files}; do
 			[ -f "${input}" ] && cat ${input} >> ${output}
 			[ -f "${input}.lua" ] && cp ${input}.lua ${dp_METADIR}
 		done
 	done
 done
 
 # *** STARTING NOW, STDOUT is +DISPLAY ***
 
 exec >${dp_METADIR}/+DISPLAY
 
 echo '['
 for message in ${dp_PKGMESSAGES}; do
 	if [ -f "${message}" ]; then
 		#if if starts with [ then it is ucl and we do drop last and first line
 		if head -1 "${message}" | grep -q '^\['; then
 			sed '1d;$d' "${message}"
 		else
 			echo '{type: install, message=<<EOD'
 			cat "${message}"
 			printf 'EOD\n},\n'
 		fi
 	fi
 done
 
 # Try and keep these messages in sync with check-deprecated
 if [ ${dp_MAINTAINER} = "ports@FreeBSD.org" ]; then
 	cat <<-EOT
 	{ message=<<EOD
 	===>   NOTICE:
 
 	The ${dp_PKGBASE} port currently does not have a maintainer. As a result, it is
 	more likely to have unresolved issues, not be up-to-date, or even be removed in
 	the future. To volunteer to maintain this port, please create an issue at:
 
 	https://bugs.freebsd.org/bugzilla
 
 	More information about port maintainership is available at:
 
 	https://docs.freebsd.org/en/articles/contributing/#ports-contributing
 	EOD
 	},
 	EOT
 fi
 
 if [ -n "${dp_DEPRECATED}" ]; then
 	cat <<-EOT
 	{ message=<<EOD
 	===>   NOTICE:
 
 	This port is deprecated; you may wish to reconsider installing it:
 
 	${dp_DEPRECATED}.
 
 	EOT
 
 	if [ -n "${dp_EXPIRATION_DATE}" ]; then
 		cat <<-EOT
 		It is scheduled to be removed on or after ${dp_EXPIRATION_DATE}.
 
 		EOT
 	fi
 	printf 'EOD\n},\n'
 fi
 echo ']'