diff --git a/multimedia/opentimelineio/Makefile b/multimedia/opentimelineio/Makefile
index 5dd60eecf39b..aa8c18be5507 100644
--- a/multimedia/opentimelineio/Makefile
+++ b/multimedia/opentimelineio/Makefile
@@ -1,30 +1,28 @@
 PORTNAME=	opentimelineio
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.17.0
-PORTREVISION=	2
+DISTVERSION=	0.18.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	API and interchange format for editorial timeline information
 WWW=		https://github.com/PixarAnimationStudios/OpenTimelineIO
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+BUILD_DEPENDS=	${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson
 LIB_DEPENDS=	libImath.so:math/Imath
 
 USES=		cmake:testing compiler:c++14-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PixarAnimationStudios
 GH_PROJECT=	OpenTimelineIO
 
-GH_TUPLE=	Tencent:rapidjson:06d58b9e848c650114556a23294d0b6440078c61:Tencent_rapidjson/src/deps/rapidjson
-
-CMAKE_ON=	OTIO_FIND_IMATH
+CMAKE_ON=	OTIO_FIND_IMATH OTIO_FIND_RAPIDJSON
 CMAKE_OFF=	OTIO_DEPENDENCIES_INSTALL
 
 PORTSCOUT=	limit:^.*[0-9]$$ # should end with a digit to prevent tags like last_pure_python
 
 .include <bsd.port.mk>
diff --git a/multimedia/opentimelineio/distinfo b/multimedia/opentimelineio/distinfo
index 42307918143b..e1ef423c5196 100644
--- a/multimedia/opentimelineio/distinfo
+++ b/multimedia/opentimelineio/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1724614743
-SHA256 (PixarAnimationStudios-OpenTimelineIO-v0.17.0_GH0.tar.gz) = cdf8281c6091a18a4147295b660e13b610a6d58919a79608bf03e5359c1c2d24
-SIZE (PixarAnimationStudios-OpenTimelineIO-v0.17.0_GH0.tar.gz) = 2340862
-SHA256 (Tencent-rapidjson-06d58b9e848c650114556a23294d0b6440078c61_GH0.tar.gz) = 30d28bbe0bfff9d8dc5d3cf62799b6ee550499cc1520e44bdece81e002480d19
-SIZE (Tencent-rapidjson-06d58b9e848c650114556a23294d0b6440078c61_GH0.tar.gz) = 1107982
+TIMESTAMP = 1762595738
+SHA256 (PixarAnimationStudios-OpenTimelineIO-v0.18.0_GH0.tar.gz) = 746854490ee1d6bfb3071027afac8cdb5c477140011be2473d26e9b724cc6283
+SIZE (PixarAnimationStudios-OpenTimelineIO-v0.18.0_GH0.tar.gz) = 1622822
diff --git a/multimedia/opentimelineio/pkg-plist b/multimedia/opentimelineio/pkg-plist
index ef9aa0d99e40..4d693be2da4c 100644
--- a/multimedia/opentimelineio/pkg-plist
+++ b/multimedia/opentimelineio/pkg-plist
@@ -1,49 +1,56 @@
 include/opentime/errorStatus.h
+include/opentime/export.h
 include/opentime/rationalTime.h
 include/opentime/stringPrintf.h
 include/opentime/timeRange.h
 include/opentime/timeTransform.h
 include/opentime/version.h
 include/opentimelineio/anyDictionary.h
 include/opentimelineio/anyVector.h
 include/opentimelineio/clip.h
+include/opentimelineio/color.h
 include/opentimelineio/composable.h
 include/opentimelineio/composition.h
 include/opentimelineio/deserialization.h
 include/opentimelineio/editAlgorithm.h
 include/opentimelineio/effect.h
 include/opentimelineio/errorStatus.h
+include/opentimelineio/export.h
 include/opentimelineio/externalReference.h
 include/opentimelineio/freezeFrame.h
 include/opentimelineio/gap.h
 include/opentimelineio/generatorReference.h
 include/opentimelineio/imageSequenceReference.h
 include/opentimelineio/item.h
 include/opentimelineio/linearTimeWarp.h
 include/opentimelineio/marker.h
 include/opentimelineio/mediaReference.h
 include/opentimelineio/missingReference.h
 include/opentimelineio/safely_typed_any.h
 include/opentimelineio/serializableCollection.h
 include/opentimelineio/serializableObject.h
 include/opentimelineio/serializableObjectWithMetadata.h
 include/opentimelineio/serialization.h
 include/opentimelineio/stack.h
 include/opentimelineio/stackAlgorithm.h
 include/opentimelineio/timeEffect.h
 include/opentimelineio/timeline.h
 include/opentimelineio/track.h
 include/opentimelineio/trackAlgorithm.h
 include/opentimelineio/transition.h
 include/opentimelineio/typeRegistry.h
 include/opentimelineio/unknownSchema.h
 include/opentimelineio/vectorIndexing.h
 include/opentimelineio/version.h
 lib/libopentime.so
+lib/libopentime.so.0.18.0
+lib/libopentime.so.18
 lib/libopentimelineio.so
+lib/libopentimelineio.so.0.18.0
+lib/libopentimelineio.so.18
 share/opentime/OpenTimeConfig.cmake
 share/opentime/OpenTimeTargets-%%CMAKE_BUILD_TYPE%%.cmake
 share/opentime/OpenTimeTargets.cmake
 %%DATADIR%%/OpenTimelineIOConfig.cmake
 %%DATADIR%%/OpenTimelineIOTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%DATADIR%%/OpenTimelineIOTargets.cmake