* of ZFS. There's no EFI designator for ZFS in the standard, so
 		 * we'll need to invent one, but its decoding will be handled in
 		 * a separate function.
@@ -328,7 +328,7 @@ errout:
  *
  * Extract the path from the File path node(s). translate any \ file separators
  * to /. Append the result to the mount point. Copy the resulting path into
- * *path.  Stat that path. If it is not found, return the errorr from stat.
+ * *path.  Stat that path. If it is not found, return the error from stat.
  *
  * Finally, check to make sure the resulting path is still on the same
  * device. If not, return ENODEV.
@@ -433,7 +433,7 @@ efivar_device_path_to_unix_path(const_efidp dp, char **dev, char **relpath, char
  * For paths of the first form:
  *	find where the filesystem is mount (either the file directly, or
  *		its parent directory).
- *	translate any logical device name (eg lable) to a physical one
+ *	translate any logical device name (eg label) to a physical one
  *	If not possible, return ENXIO
  *	If the physical path is unsupported (Eg not on a GPT or MBR disk),
  *		return ENXIO
@@ -442,7 +442,7 @@ efivar_device_path_to_unix_path(const_efidp dp, char **dev, char **relpath, char
  * 		as a file path.
  *
  * For paths matching the second form:
- *	find the EFI partition corresponding to the root fileystem.
+ *	find the EFI partition corresponding to the root filesystem.
  *	If none found, return ENXIO
  *	Create a media device path node for the found partition
  *	Append a File Path to the end for the rest of the file.
@@ -553,7 +553,7 @@ find_geom_efimedia(struct gmesh *mesh, const char *dev)
 	efimedia = geom_pp_attr(mesh, pp, "efimedia");
 
 	/*
-	 * If this device doesn't hav an efimedia attribute, see if it is a
+	 * If this device doesn't have an efimedia attribute, see if it is a
 	 * glabel node, and if so look for the underlying provider to get the
 	 * efimedia attribute from.
 	 */
diff --git a/lib/libefivar/efivar.h b/lib/libefivar/efivar.h
index e159f4cccd3d..238b23a8b2b8 100644
--- a/lib/libefivar/efivar.h
+++ b/lib/libefivar/efivar.h
@@ -31,7 +31,7 @@
 #include <sys/endian.h>
 #include <stdint.h>
 
-/* Shoud these be elsewhere ? */
+/* Should these be elsewhere ? */
 #define	EFI_VARIABLE_NON_VOLATILE		0x00000001
 #define	EFI_VARIABLE_BOOTSERVICE_ACCESS		0x00000002
 #define	EFI_VARIABLE_RUNTIME_ACCESS		0x00000004
diff --git a/lib/libefivar/uefi-dputil.c b/lib/libefivar/uefi-dputil.c
index c31da14eed2d..1f6a051ce600 100644
--- a/lib/libefivar/uefi-dputil.c
+++ b/lib/libefivar/uefi-dputil.c
@@ -127,7 +127,7 @@ GetDevicePathSize (
   @param  MaxSize     The maximum size of the device path data structure.
 
   @retval TRUE        DevicePath is valid.
-  @retval FALSE       The length of any node in the DevicePath is less
+  @retval FALSE       The length of any node Node in the DevicePath is less
                       than sizeof (EFI_DEVICE_PATH_PROTOCOL).
   @retval FALSE       If MaxSize is not zero, the size of the DevicePath
                       exceeds MaxSize.
diff --git a/sys/sys/efi-edk2.h b/sys/sys/efi-edk2.h
index b27b26bd613c..d591c253a3e0 100644
--- a/sys/sys/efi-edk2.h
+++ b/sys/sys/efi-edk2.h
@@ -72,7 +72,7 @@ typedef void VOID;
 /*
  * Note: the EDK2 code assumed #pragma packed works and PACKED is a
  * workaround for some old toolchain issues for EDK2 that aren't
- * relevent to FreeBSD.
+ * relevant to FreeBSD.
  */
 #define PACKED