Index: release/tools/azure.conf
===================================================================
--- release/tools/azure.conf
+++ release/tools/azure.conf
@@ -20,8 +20,6 @@
 	echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	echo 'ifconfig_hn0="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
 	echo 'waagent_enable="YES"' >> ${DESTDIR}/etc/rc.conf
-	echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf
-	echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf
 
 	rm -f ${DESTDIR}/etc/resolv.conf
 
Index: release/tools/vmimage.subr
===================================================================
--- release/tools/vmimage.subr
+++ release/tools/vmimage.subr
@@ -148,6 +148,18 @@
 	hostname="$(echo $(uname -o) | tr '[:upper:]' '[:lower:]')"
 	echo "hostname=\"${hostname}\"" >> ${DESTDIR}/etc/rc.conf
 
+	# Add support for the serial console.
+	# NB: hardcode the console speed to 115200: there is no reason to use a
+	# slower speed when running virtualized, since the provided emulated
+	# serial port should certainly support the highest possible speed.
+	cat << EOF >> ${DESTDIR}/boot/loader.conf
+boot_multicons="YES"
+boot_serial="YES"
+comconsole_speed="115200"
+console="comconsole,vidconsole"
+EOF
+	echo '-D -S115200' > ${DESTDIR}/boot.config
+
 	if ! [ -z "${QEMUSTATIC}" ]; then
 		export EMULATOR=/qemu
 		cp ${QEMUSTATIC} ${DESTDIR}/${EMULATOR}