diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile
index bbf8071a91c..9e52e5acf42 100644
--- a/usr.sbin/bsdinstall/Makefile
+++ b/usr.sbin/bsdinstall/Makefile
@@ -1,5 +1,5 @@
 
-OSNAME?=	FreeBSD
+OSNAME?=	OPNsense
 SUBDIR=	distextract distfetch partedit runconsoles scripts
 SUBDIR_PARALLEL=
 SUBDIR_DEPEND_distfetch = distextract
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index 6a536271c25..3256a74edc4 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "partedit.h"
@@ -111,7 +112,8 @@ const char *
 bootpart_type(const char *scheme, const char **mountpoint)
 {
 
-	if (strcmp(x86_bootmethod(), "UEFI") == 0) {
+	if (strcmp(x86_bootmethod(), "UEFI") == 0 ||
+	    getenv("WORKAROUND_HYBRID")) {
 		*mountpoint = "/boot/efi";
 		return ("efi");
 	}