diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile
--- a/sysutils/opensbi/Makefile
+++ b/sysutils/opensbi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opensbi
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.0
+DISTVERSION=	1.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	mhorne@FreeBSD.org
@@ -8,7 +8,11 @@
 
 LICENSE=	BSD2CLAUSE
 
-USES=		gmake
+BUILD_DEPENDS=	bash:shells/bash
+
+USES=		gmake shebangfix
+SHEBANG_FILES=	scripts/*.sh
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	riscv
 
diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo
--- a/sysutils/opensbi/distinfo
+++ b/sysutils/opensbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641325249
-SHA256 (riscv-opensbi-v1.0_GH0.tar.gz) = a5efaeb24f5ee88d13d5788e4e00623ff312ee12c0bf736aa75a6ad9a850fb76
-SIZE (riscv-opensbi-v1.0_GH0.tar.gz) = 225774
+TIMESTAMP = 1656188838
+SHA256 (riscv-opensbi-v1.1_GH0.tar.gz) = d183cb890130983a4f01e75fc03ee4f7ea0e16a7923b8af9c6dff7deb2fedaec
+SIZE (riscv-opensbi-v1.1_GH0.tar.gz) = 241383
diff --git a/sysutils/opensbi/files/patch-platform_generic_platform.c b/sysutils/opensbi/files/patch-platform_generic_platform.c
--- a/sysutils/opensbi/files/patch-platform_generic_platform.c
+++ b/sysutils/opensbi/files/patch-platform_generic_platform.c
@@ -1,11 +1,11 @@
---- platform/generic/platform.c.orig	2021-12-24 11:57:44 UTC
+--- platform/generic/platform.c.orig	2022-06-25 03:42:10 UTC
 +++ platform/generic/platform.c
-@@ -23,6 +23,8 @@
+@@ -24,6 +24,8 @@
  #include <sbi_utils/ipi/fdt_ipi.h>
  #include <sbi_utils/reset/fdt_reset.h>
  
 +int need_pmp_war = FALSE;
 +
- extern const struct platform_override sifive_fu540;
- extern const struct platform_override sifive_fu740;
- 
+ /* List of platform override modules generated at compile time */
+ extern const struct platform_override *platform_override_modules[];
+ extern unsigned long platform_override_modules_size;
diff --git a/sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c
rename from sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c
rename to sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c
--- a/sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c
+++ b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c
@@ -1,5 +1,5 @@
---- platform/generic/sifive_fu540.c.orig	2021-12-24 11:57:44 UTC
-+++ platform/generic/sifive_fu540.c
+--- platform/generic/sifive/fu540.c.orig	2022-06-26 14:27:30 UTC
++++ platform/generic/sifive/fu540.c
 @@ -11,6 +11,15 @@
  #include <sbi_utils/fdt/fdt_helper.h>
  #include <sbi_utils/fdt/fdt_fixup.h>
@@ -16,7 +16,7 @@
  static u64 sifive_fu540_tlbr_flush_limit(const struct fdt_match *match)
  {
  	/*
-@@ -41,6 +50,7 @@ static const struct fdt_match sifive_fu540_match[] = {
+@@ -41,6 +50,7 @@ const struct platform_override sifive_fu540 = {
  };
  
  const struct platform_override sifive_fu540 = {
diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile
--- a/sysutils/u-boot-sifive-fu540/Makefile
+++ b/sysutils/u-boot-sifive-fu540/Makefile
@@ -5,6 +5,8 @@
 FAMILY=		sifive
 UBOOT_ARCH=	riscv64
 
+U_BOOT_SLAVE_PORTREVISION_2022.04=	2
+
 # The FIT image will embed an OpenSBI firmware binary
 OPENSBI_FIRM=	${LOCALBASE}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin
 BUILD_DEPENDS+=	${OPENSBI_FIRM}:sysutils/opensbi
diff --git a/sysutils/u-boot-sifive-fu740/Makefile b/sysutils/u-boot-sifive-fu740/Makefile
--- a/sysutils/u-boot-sifive-fu740/Makefile
+++ b/sysutils/u-boot-sifive-fu740/Makefile
@@ -5,6 +5,8 @@
 FAMILY=		sifive
 UBOOT_ARCH=	riscv64
 
+U_BOOT_SLAVE_PORTREVISION_2022.04=	2
+
 # The FIT image will embed an OpenSBI firmware binary
 OPENSBI_FIRM=	${LOCALBASE}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin
 BUILD_DEPENDS+=	${OPENSBI_FIRM}:sysutils/opensbi