Index: sysutils/opensbi/Makefile
===================================================================
--- sysutils/opensbi/Makefile
+++ sysutils/opensbi/Makefile
@@ -2,18 +2,18 @@
 
 PORTNAME=	opensbi
 DISTVERSIONPREFIX=v
-DISTVERSION=	0.6
+DISTVERSION=	0.7
 CATEGORIES=	sysutils
 
 MAINTAINER=	mhorne@FreeBSD.org
 COMMENT=	RISC-V SBI bootloader and firmware
 
 LICENSE=	BSD2CLAUSE
+
 BUILD_DEPENDS=	${RISCV_PREFIX}gcc:devel/riscv64-none-elf-gcc \
 		${RISCV_PREFIX}ld:devel/binutils@riscv64_none_elf
 
 USES=		gmake
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	riscv
 
@@ -44,16 +44,15 @@
 	${MAKE_CMD} -C ${WRKSRC} ${MAKE_ARGS} PLATFORM=${${platform}_PLATFORM}
 
 do-install-${platform}-on:
-	${MKDIR} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${LOCALBASE}
 	${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} \
-		I=${STAGEDIR}${DATADIR} install_firmwares
+		I=${STAGEDIR}${LOCALBASE} install_firmwares
 	${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} \
-		I=${STAGEDIR}${DATADIR} install_libplatsbi
+		I=${STAGEDIR}${LOCALBASE} install_libplatsbi
 
 post-install-${platform}-on:
 	${STRIP_CMD} ${${platform}_STRIP_ARGS} \
-	    ${STAGEDIR}${DATADIR}/platform/${${platform}_PLATFORM}/firmware/fw_*.elf
-	${STRIP_CMD} ${STAGEDIR}${DATADIR}/platform/${${platform}_PLATFORM}/firmware/payloads/test.elf
+	    ${STAGEDIR}${DATADIR}/lp64/${${platform}_PLATFORM}/firmware/fw_*.elf
 
 .endfor # OPTIONS_GROUP_PLATFORMS
 
Index: sysutils/opensbi/distinfo
===================================================================
--- sysutils/opensbi/distinfo
+++ sysutils/opensbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582555902
-SHA256 (riscv-opensbi-v0.6_GH0.tar.gz) = 46a93afd5465eba094ddba40015e754bf09f9e80e0702c00013d6bdb3ecd0a72
-SIZE (riscv-opensbi-v0.6_GH0.tar.gz) = 148351
+TIMESTAMP = 1588256868
+SHA256 (riscv-opensbi-v0.7_GH0.tar.gz) = f6c3d2f8cfec89495d5f6769af14b45102eea5a53da58dccb7ad5d85ad102e50
+SIZE (riscv-opensbi-v0.7_GH0.tar.gz) = 157275
Index: sysutils/opensbi/pkg-plist
===================================================================
--- sysutils/opensbi/pkg-plist
+++ sysutils/opensbi/pkg-plist
@@ -6,8 +6,8 @@
 include/sbi/riscv_fp.h
 include/sbi/riscv_io.h
 include/sbi/riscv_locks.h
+include/sbi/sbi_bitmap.h
 include/sbi/sbi_bitops.h
-include/sbi/sbi_bits.h
 include/sbi/sbi_console.h
 include/sbi/sbi_const.h
 include/sbi/sbi_ecall.h
@@ -16,7 +16,9 @@
 include/sbi/sbi_error.h
 include/sbi/sbi_fifo.h
 include/sbi/sbi_hart.h
+include/sbi/sbi_hartmask.h
 include/sbi/sbi_hfence.h
+include/sbi/sbi_hsm.h
 include/sbi/sbi_illegal_insn.h
 include/sbi/sbi_init.h
 include/sbi/sbi_ipi.h
@@ -32,35 +34,25 @@
 include/sbi/sbi_types.h
 include/sbi/sbi_unpriv.h
 include/sbi/sbi_version.h
+include/sbi_utils/fdt/fdt_fixup.h
+include/sbi_utils/fdt/fdt_helper.h
 include/sbi_utils/irqchip/plic.h
 include/sbi_utils/serial/sifive-uart.h
 include/sbi_utils/serial/uart8250.h
 include/sbi_utils/sys/clint.h
 include/sbi_utils/sys/htif.h
-lib/libsbi.a
-lib/libsbiutils.a
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_dynamic.bin
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_dynamic.elf
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_jump.bin
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_jump.elf
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_payload.bin
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_payload.elf
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/payloads/test.bin
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/payloads/test.elf
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/lib/libplatsbi.a
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_dynamic.bin
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_dynamic.elf
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_jump.bin
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_jump.elf
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_payload.bin
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_payload.elf
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/payloads/test.bin
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/payloads/test.elf
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/lib/libplatsbi.a
-%%SPIKE%%%%DATADIR%%/platform/spike/firmware/fw_jump.bin
-%%SPIKE%%%%DATADIR%%/platform/spike/firmware/fw_jump.elf
-%%SPIKE%%%%DATADIR%%/platform/spike/firmware/fw_payload.bin
-%%SPIKE%%%%DATADIR%%/platform/spike/firmware/fw_payload.elf
-%%SPIKE%%%%DATADIR%%/platform/spike/firmware/payloads/test.bin
-%%SPIKE%%%%DATADIR%%/platform/spike/firmware/payloads/test.elf
-%%SPIKE%%%%DATADIR%%/platform/spike/lib/libplatsbi.a
+lib64/lp64/libsbi.a
+lib64/lp64/libsbiutils.a
+%%QEMU_VIRT%%%%DATADIR%%/lp64/qemu/virt/firmware/fw_dynamic.bin
+%%QEMU_VIRT%%%%DATADIR%%/lp64/qemu/virt/firmware/fw_dynamic.elf
+%%QEMU_VIRT%%%%DATADIR%%/lp64/qemu/virt/firmware/fw_jump.bin
+%%QEMU_VIRT%%%%DATADIR%%/lp64/qemu/virt/firmware/fw_jump.elf
+%%QEMU_VIRT%%lib64/lp64/opensbi/qemu/virt/lib/libplatsbi.a
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_dynamic.bin
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_dynamic.elf
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_jump.bin
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_jump.elf
+%%SIFIVE_FU540%%lib64/lp64/opensbi/sifive/fu540/lib/libplatsbi.a
+%%SPIKE%%%%DATADIR%%/lp64/spike/firmware/fw_jump.bin
+%%SPIKE%%%%DATADIR%%/lp64/spike/firmware/fw_jump.elf
+%%SPIKE%%lib64/lp64/opensbi/spike/lib/libplatsbi.a