diff --git a/multimedia/Bento4/Makefile b/multimedia/Bento4/Makefile
index 628d33b0e100..d75de31da77f 100644
--- a/multimedia/Bento4/Makefile
+++ b/multimedia/Bento4/Makefile
@@ -1,46 +1,49 @@
 PORTNAME=	Bento4
 PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=v
 DISTVERSIONSUFFIX=-639
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia devel
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Full-featured MP4 format and MPEG DASH library and tools
 WWW=		https://www.bento4.com
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=		fails to compile: Ap4AesBlockCipher.cpp:93:4: AP4_PLATFORM_BYTE_ORDER is not set
 BROKEN_riscv64=		fails to compile: Ap4AesBlockCipher.cpp:93:4: AP4_PLATFORM_BYTE_ORDER is not set
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake:noninja cpe python shebangfix
 CPE_VENDOR=	axiosys
 USE_GITHUB=	yes
 GH_ACCOUNT=	axiomatic-systems
 SHEBANG_FILES=	Source/Python/*/*
 SHEBANG_GLOB=	*.sh *.py
 
 CMAKE_BUILD_TYPE=	Release
 INSTALL_TARGET=		do-install
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|g' ${WRKSRC}/Source/Python/wrappers/*
 	@${REINPLACE_CMD} -e 's|$$BASEDIR/..|${DATADIR}|g' ${WRKSRC}/Source/Python/wrappers/*
 
 do-install:
 .	for prog in aac2mp4 mp42aac mp42hls mp42ts mp4compact mp4dcfpackager \
 	    mp4decrypt mp4diff mp4dump mp4edit mp4encrypt mp4extract mp4fragment \
 	    mp4iframeindex mp4info mp4mux mp4split mp4tag
 		${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin
 .	endfor
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/libap4.a ${STAGEDIR}${PREFIX}/lib
 	@${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	cd ${WRKSRC}/Source/Python/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils
 .	for prog in mp4dash mp4dashclone mp4hls
 	${INSTALL_SCRIPT} ${WRKSRC}/Source/Python/wrappers/${prog} ${STAGEDIR}${PREFIX}/bin
 .	endfor
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/Bento4
+	@${FIND} -s ${WRKSRC} -type f -name "*.h" -type f \
+		-exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/Bento4 ';'
 
 .include <bsd.port.mk>
diff --git a/multimedia/Bento4/pkg-plist b/multimedia/Bento4/pkg-plist
index f77c391c5254..ef0899d2756c 100644
--- a/multimedia/Bento4/pkg-plist
+++ b/multimedia/Bento4/pkg-plist
@@ -1,33 +1,178 @@
 bin/aac2mp4
 bin/mp42aac
 bin/mp42hls
 bin/mp42ts
 bin/mp4compact
 bin/mp4dash
 bin/mp4dashclone
 bin/mp4dcfpackager
 bin/mp4decrypt
 bin/mp4diff
 bin/mp4dump
 bin/mp4edit
 bin/mp4encrypt
 bin/mp4extract
 bin/mp4fragment
 bin/mp4hls
 bin/mp4iframeindex
 bin/mp4info
 bin/mp4mux
 bin/mp4split
 bin/mp4tag
 lib/libap4.a
+include/Bento4/Ap4.h
+include/Bento4/Ap48bdlAtom.h
+include/Bento4/Ap4Ac3Parser.h
+include/Bento4/Ap4Ac4Parser.h
+include/Bento4/Ap4Ac4Utils.h
+include/Bento4/Ap4AdtsParser.h
+include/Bento4/Ap4AesBlockCipher.h
+include/Bento4/Ap4AinfAtom.h
+include/Bento4/Ap4Array.h
+include/Bento4/Ap4Atom.h
+include/Bento4/Ap4AtomFactory.h
+include/Bento4/Ap4AtomSampleTable.h
+include/Bento4/Ap4AtomixAdapters.h
+include/Bento4/Ap4Av1cAtom.h
+include/Bento4/Ap4AvcParser.h
+include/Bento4/Ap4AvccAtom.h
+include/Bento4/Ap4BitStream.h
+include/Bento4/Ap4BlocAtom.h
+include/Bento4/Ap4ByteStream.h
+include/Bento4/Ap4Co64Atom.h
+include/Bento4/Ap4Command.h
+include/Bento4/Ap4CommandFactory.h
+include/Bento4/Ap4CommonEncryption.h
+include/Bento4/Ap4Config.h
+include/Bento4/Ap4Constants.h
+include/Bento4/Ap4ContainerAtom.h
+include/Bento4/Ap4CttsAtom.h
+include/Bento4/Ap4Dac3Atom.h
+include/Bento4/Ap4Dac4Atom.h
+include/Bento4/Ap4DataBuffer.h
+include/Bento4/Ap4Debug.h
+include/Bento4/Ap4Dec3Atom.h
+include/Bento4/Ap4DecoderConfigDescriptor.h
+include/Bento4/Ap4DecoderSpecificInfoDescriptor.h
+include/Bento4/Ap4Descriptor.h
+include/Bento4/Ap4DescriptorFactory.h
+include/Bento4/Ap4DrefAtom.h
+include/Bento4/Ap4DvccAtom.h
+include/Bento4/Ap4DynamicCast.h
+include/Bento4/Ap4Eac3Parser.h
+include/Bento4/Ap4ElstAtom.h
+include/Bento4/Ap4EsDescriptor.h
+include/Bento4/Ap4EsdsAtom.h
+include/Bento4/Ap4Expandable.h
+include/Bento4/Ap4File.h
+include/Bento4/Ap4FileByteStream.h
+include/Bento4/Ap4FileCopier.h
+include/Bento4/Ap4FileWriter.h
+include/Bento4/Ap4FragmentSampleTable.h
+include/Bento4/Ap4FrmaAtom.h
+include/Bento4/Ap4FtypAtom.h
+include/Bento4/Ap4GrpiAtom.h
+include/Bento4/Ap4HdlrAtom.h
+include/Bento4/Ap4HevcParser.h
+include/Bento4/Ap4HintTrackReader.h
+include/Bento4/Ap4Hmac.h
+include/Bento4/Ap4HmhdAtom.h
+include/Bento4/Ap4HvccAtom.h
+include/Bento4/Ap4IkmsAtom.h
+include/Bento4/Ap4Interfaces.h
+include/Bento4/Ap4IodsAtom.h
+include/Bento4/Ap4Ipmp.h
+include/Bento4/Ap4IproAtom.h
+include/Bento4/Ap4IsfmAtom.h
+include/Bento4/Ap4IsltAtom.h
+include/Bento4/Ap4IsmaCryp.h
+include/Bento4/Ap4KeyWrap.h
+include/Bento4/Ap4LinearReader.h
+include/Bento4/Ap4List.h
+include/Bento4/Ap4Marlin.h
+include/Bento4/Ap4MdhdAtom.h
+include/Bento4/Ap4MehdAtom.h
+include/Bento4/Ap4MetaData.h
+include/Bento4/Ap4MfhdAtom.h
+include/Bento4/Ap4MfroAtom.h
+include/Bento4/Ap4MoovAtom.h
+include/Bento4/Ap4Movie.h
+include/Bento4/Ap4MovieFragment.h
+include/Bento4/Ap4Mp4AudioInfo.h
+include/Bento4/Ap4Mpeg2Ts.h
+include/Bento4/Ap4MvhdAtom.h
+include/Bento4/Ap4NalParser.h
+include/Bento4/Ap4NeptuneAdapters.h
+include/Bento4/Ap4NmhdAtom.h
+include/Bento4/Ap4ObjectDescriptor.h
+include/Bento4/Ap4OdafAtom.h
+include/Bento4/Ap4OddaAtom.h
+include/Bento4/Ap4OdheAtom.h
+include/Bento4/Ap4OhdrAtom.h
+include/Bento4/Ap4OmaDcf.h
+include/Bento4/Ap4PdinAtom.h
+include/Bento4/Ap4Piff.h
+include/Bento4/Ap4Processor.h
+include/Bento4/Ap4Protection.h
+include/Bento4/Ap4PsshAtom.h
+include/Bento4/Ap4Results.h
+include/Bento4/Ap4RtpAtom.h
+include/Bento4/Ap4RtpHint.h
+include/Bento4/Ap4SLConfigDescriptor.h
+include/Bento4/Ap4SaioAtom.h
+include/Bento4/Ap4SaizAtom.h
+include/Bento4/Ap4Sample.h
+include/Bento4/Ap4SampleDescription.h
+include/Bento4/Ap4SampleEntry.h
+include/Bento4/Ap4SampleSource.h
+include/Bento4/Ap4SampleTable.h
+include/Bento4/Ap4SbgpAtom.h
+include/Bento4/Ap4SchmAtom.h
+include/Bento4/Ap4SdpAtom.h
+include/Bento4/Ap4SegmentBuilder.h
+include/Bento4/Ap4SencAtom.h
+include/Bento4/Ap4SgpdAtom.h
+include/Bento4/Ap4SidxAtom.h
+include/Bento4/Ap4SmhdAtom.h
+include/Bento4/Ap4StcoAtom.h
+include/Bento4/Ap4SthdAtom.h
+include/Bento4/Ap4StreamCipher.h
+include/Bento4/Ap4String.h
+include/Bento4/Ap4StscAtom.h
+include/Bento4/Ap4StsdAtom.h
+include/Bento4/Ap4StssAtom.h
+include/Bento4/Ap4StszAtom.h
+include/Bento4/Ap4SttsAtom.h
+include/Bento4/Ap4Stz2Atom.h
+include/Bento4/Ap4SyntheticSampleTable.h
+include/Bento4/Ap4TencAtom.h
+include/Bento4/Ap4TfdtAtom.h
+include/Bento4/Ap4TfhdAtom.h
+include/Bento4/Ap4TfraAtom.h
+include/Bento4/Ap4TimsAtom.h
+include/Bento4/Ap4TkhdAtom.h
+include/Bento4/Ap4Track.h
+include/Bento4/Ap4TrakAtom.h
+include/Bento4/Ap4TrefTypeAtom.h
+include/Bento4/Ap4TrexAtom.h
+include/Bento4/Ap4TrunAtom.h
+include/Bento4/Ap4Types.h
+include/Bento4/Ap4UrlAtom.h
+include/Bento4/Ap4Utils.h
+include/Bento4/Ap4UuidAtom.h
+include/Bento4/Ap4Version.h
+include/Bento4/Ap4VmhdAtom.h
+include/Bento4/Ap4VpccAtom.h
+include/Bento4/Bento4C.h
+@dir include/Bento4
 %%DATADIR%%/utils/aes.py
 %%DATADIR%%/utils/check-indexes.py
 %%DATADIR%%/utils/mp4-dash-clone.py
 %%DATADIR%%/utils/mp4-dash-encode.py
 %%DATADIR%%/utils/mp4-dash.py
 %%DATADIR%%/utils/mp4-hls.py
 %%DATADIR%%/utils/mp4utils.py
 %%DATADIR%%/utils/pr-derive-key.py
 %%DATADIR%%/utils/skm.py
 %%DATADIR%%/utils/subtitles.py
 %%DATADIR%%/utils/wv-request.py