diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c
index a0f8165675d9..36f9edd91c74 100644
--- a/usr.sbin/efivar/efivar.c
+++ b/usr.sbin/efivar/efivar.c
@@ -251,6 +251,17 @@ print_variables(void)
 		err(1, "Error listing names");
 }
 
+static void
+print_known_guid(void)
+{
+	struct uuid_table *tbl;
+	int i, n;
+
+	n = efi_known_guid(&tbl);
+	for (i = 0; i < n; i++)
+		printf("%s %s\n", tbl[i].uuid_str, tbl[i].name);
+}
+
 static void
 parse_args(int argc, char **argv)
 {
@@ -333,6 +344,8 @@ parse_args(int argc, char **argv)
 		delete_variable(varname);
 	else if (wflag)
 		write_variable(varname, NULL);
+	else if (Lflag)
+		print_known_guid();
 	else if (varname) {
 		pflag++;
 		print_variable(varname);