diff --git a/documentation/content/en/books/handbook/advanced-networking/_index.adoc b/documentation/content/en/books/handbook/advanced-networking/_index.adoc
--- a/documentation/content/en/books/handbook/advanced-networking/_index.adoc
+++ b/documentation/content/en/books/handbook/advanced-networking/_index.adoc
@@ -1961,6 +1961,12 @@
 In FreeBSD, the boot loader file is [.filename]#/boot/pxeboot#.
 After [.filename]#/boot/pxeboot# executes, the FreeBSD kernel is loaded and the rest of the FreeBSD bootup sequence proceeds, as described in crossref:boot[boot,The FreeBSD Booting Process].
 
+[NOTE]
+====
+For UEFI PXE based boot, the actual boot loader file to use is [.filename]#/boot/loader.efi#.
+See the below section crossref:advanced-networking[_debugging_pxe_problems,Debugging PXE Problems] on how to use [.filename]#/boot/loader.efi#.
+====
+
 This section describes how to configure these services on a FreeBSD system so that other systems can PXE boot into FreeBSD.
 Refer to man:diskless[8] for more information.
 
@@ -2025,11 +2031,12 @@
 +
 [.programlisting]
 ....
-tftp dgram udp wait root /usr/libexec/tftpd tftpd -l -s /b/tftpboot
+tftp dgram udp wait root /usr/libexec/tftpd tftpd blocksize 1468 -l -s /b/tftpboot
 ....
 +
 [NOTE]
 ====
+The specified tftp blocksize, e.g. 1468 bytes, replaces the default size 512 bytes.
 Some PXE versions require the TCP version of TFTP.
 In this case, uncomment the second `tftp` line which contains `stream tcp`.
 ====
@@ -2180,6 +2187,14 @@
 ....
 # mount -t nfs 192.168.0.1:/b/tftpboot/FreeBSD/install /mnt
 ....
++
+. For UEFI PXE based booting, replace the [.filename]#boot/pxeboot# file with the [.filename]#boot/loader.efi# file:
+[source,shell]
+....
+# chroot ${NFSROOTDIR}
+# mv boot/pxeboot boot/pxeboot.original
+# cp boot/loader.efi boot/pxeboot
+....
 ****
 
 [[carp]]