Index: head/stand/forth/Makefile
===================================================================
--- head/stand/forth/Makefile	(revision 331325)
+++ head/stand/forth/Makefile	(revision 331326)
@@ -1,45 +1,46 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 MAN+=	beastie.4th.8 \
 	brand.4th.8 \
 	check-password.4th.8 \
 	color.4th.8 \
 	delay.4th.8 \
 	loader.4th.8 \
 	menu.4th.8 \
 	menusets.4th.8 \
 	version.4th.8
 
 FILES+=	beastie.4th
 FILES+=	brand.4th
 FILES+=	brand-fbsd.4th
 FILES+=	check-password.4th
 FILES+=	color.4th
 FILES+=	delay.4th
+FILES+=	efi.4th
 FILES+=	frames.4th
 FILES+=	loader.4th
 FILES+=	logo-beastie.4th
 FILES+=	logo-beastiebw.4th
 FILES+=	logo-fbsdbw.4th
 FILES+=	logo-orb.4th
 FILES+=	logo-orbbw.4th
 FILES+=	menu.4th
 FILES+=	menu-commands.4th
 FILES+=	menusets.4th
 FILES+=	screen.4th
 FILES+=	shortcuts.4th
 FILES+=	support.4th
 FILES+=	version.4th
 
 # Allow machine specific loader.rc to be installed.
 .for f in loader.rc menu.rc
 .if exists(${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f})
 FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f}
 .else
 FILES+= ${f}
 .endif
 .endfor
 
 .include <bsd.prog.mk>
Index: head/stand/forth/efi.4th
===================================================================
--- head/stand/forth/efi.4th	(revision 331325)
+++ head/stand/forth/efi.4th	(revision 331326)
@@ -1,30 +1,41 @@
 \ Copyright (c) 2016 Netflix, Inc
 \ All rights reserved.
 \
 \ 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.
 \
 \ $FreeBSD$
 
 only forth definitions
 
-\ Place holder for more functions
+: efiboot? ( -- flag )
+	s" efi-version" getenv -1 <> dup if
+		swap drop ( c-addr flag -- flag )
+	then
+;
+
+: maybe-efi-resizecons
+	efiboot? if
+		efi-autoresizecons
+	then
+;
+
 .( EFI boot environment) cr
Index: head/stand/forth/loader.rc
===================================================================
--- head/stand/forth/loader.rc	(revision 331325)
+++ head/stand/forth/loader.rc	(revision 331326)
@@ -1,23 +1,26 @@
 \ Loader.rc
 \ $FreeBSD$
 \
 \ You should not edit this file! Put any overrides in loader.rc.local
 \ instead as this file can be replaced during system updates.
 \
 \ Includes additional commands
 include /boot/loader.4th
+include /boot/efi.4th
 try-include /boot/loader.rc.local
 
 \ Reads and processes loader.conf variables
 \ NOTE: Change to `initialize' if you enable the below boot menu
 start
+
+maybe-efi-resizecons
 
 \ Tests for password -- executes autoboot first if a password was defined
 check-password
 
 \ Uncomment to enable boot menu
 \ include /boot/beastie.4th
 \ beastie-start
 
 \ Unless set otherwise, autoboot is automatic at this point
 
Index: head/stand/i386/loader/loader.rc
===================================================================
--- head/stand/i386/loader/loader.rc	(revision 331325)
+++ head/stand/i386/loader/loader.rc	(revision 331326)
@@ -1,18 +1,21 @@
 \ Loader.rc
 \ $FreeBSD$
 \
 \ Includes additional commands
 include /boot/loader.4th
+include /boot/efi.4th
 try-include /boot/loader.rc.local
 
 \ Reads and processes loader.conf variables
 initialize
+
+maybe-efi-resizecons
 
 \ Tests for password -- executes autoboot first if a password was defined
 check-password
 
 \ Load in the boot menu
 include /boot/beastie.4th
 
 \ Start the boot menu
 beastie-start