diff --git a/devel/libunicode-contour/Makefile b/devel/libunicode-contour/Makefile
index cda04b8ae1df..37c6babaa37f 100644
--- a/devel/libunicode-contour/Makefile
+++ b/devel/libunicode-contour/Makefile
@@ -1,50 +1,49 @@
 PORTNAME=	libunicode
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.0
-PORTREVISION=	2
+DISTVERSION=	0.7.0
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-contour
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Modern C++20 Unicode library
 WWW=		https://github.com/contour-terminal/libunicode
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/share/pkgconfig/catch2-with-main.pc:devel/catch2 \
-		UCD>=16.0.0,1:textproc/UCD
+		UCD>=17.0.0,1:textproc/UCD
 
 USES=		cmake:testing
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	contour-terminal
 
 USE_LDCONFIG=	${PREFIX}/lib/contour
 
 CMAKE_ARGS=	-DLIBUNICODE_UCD_DIR:STRING=${LOCALBASE}/share/unicode/ucd \
 		${CMAKE_ARGS_${ARCH}}
-CMAKE_ARGS_armv7=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=std
-CMAKE_ARGS_i386=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=std
 CMAKE_ARGS_powerpc64=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=sse2
 CMAKE_ARGS_powerpc64le=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=sse2
 CXXFLAGS_powerpc64=	-DNO_WARN_X86_INTRINSICS -D__SSE2__ -mvsx
 CXXFLAGS_powerpc64le=	-DNO_WARN_X86_INTRINSICS -D__SSE2__
 
 REINPLACE_ARGS=	-i ''
 
+PLIST_SUB=	SOVERSION_FULL=${DISTVERSION} \
+		SOVERSION_MAJOR_MINOR=${DISTVERSION:R}
 PORTDOCS=	README.md TODO.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/contour
 	${MV} ${STAGEDIR}${PREFIX}/lib/*.* ${STAGEDIR}${PREFIX}/lib/contour
 	${REINPLACE_CMD} -e 's|$${_IMPORT_PREFIX}/lib/|$${_IMPORT_PREFIX}/lib/contour/|' \
 		${STAGEDIR}${PREFIX}/lib/cmake/libunicode/libunicode-targets-${CMAKE_BUILD_TYPE:tl}.cmake
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/libunicode-contour/distinfo b/devel/libunicode-contour/distinfo
index d0af254b4023..13adad56fece 100644
--- a/devel/libunicode-contour/distinfo
+++ b/devel/libunicode-contour/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748784770
-SHA256 (contour-terminal-libunicode-v0.6.0_GH0.tar.gz) = 0c217f8264000f1b8c36e78969cb9cf91ac97de937cc141ab78e6b1ad7f404ef
-SIZE (contour-terminal-libunicode-v0.6.0_GH0.tar.gz) = 92750
+TIMESTAMP = 1767667689
+SHA256 (contour-terminal-libunicode-v0.7.0_GH0.tar.gz) = 7b653d8cb3c620cc80118184ccab9c02f7e9a4bf9d1e4b190dae2d5681a0bca4
+SIZE (contour-terminal-libunicode-v0.7.0_GH0.tar.gz) = 94993
diff --git a/devel/libunicode-contour/files/patch-src_libunicode_CMakeLists.txt b/devel/libunicode-contour/files/patch-src_libunicode_CMakeLists.txt
new file mode 100644
index 000000000000..0ba316b67870
--- /dev/null
+++ b/devel/libunicode-contour/files/patch-src_libunicode_CMakeLists.txt
@@ -0,0 +1,17 @@
+--- src/libunicode/CMakeLists.txt.orig	2025-12-22 21:10:19 UTC
++++ src/libunicode/CMakeLists.txt
+@@ -97,9 +97,13 @@ target_link_libraries(unicode_loader PUBLIC  unicode::
+ 
+ # =========================================================================================================
+ 
++string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSTEM_PROCESSOR_LOWER)
+ 
+ if(LIBUNICODE_SIMD_IMPLEMENTATION STREQUAL "std" OR LIBUNICODE_SIMD_IMPLEMENTATION STREQUAL "intrinsics")
+-    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
++    if(SYSTEM_PROCESSOR_LOWER STREQUAL "x86_64" OR
++       SYSTEM_PROCESSOR_LOWER STREQUAL "amd64" OR
++       SYSTEM_PROCESSOR_LOWER STREQUAL "aarch64" OR
++       SYSTEM_PROCESSOR_LOWER STREQUAL "arm64")
+         set(LIBUNICODE_SIMD_SOURCES
+             simd_detector.cpp
+             scan256.cpp
diff --git a/devel/libunicode-contour/pkg-plist b/devel/libunicode-contour/pkg-plist
index d8de5d928c9b..0cac873baa5c 100644
--- a/devel/libunicode-contour/pkg-plist
+++ b/devel/libunicode-contour/pkg-plist
@@ -1,35 +1,35 @@
 bin/unicode-query
 include/libunicode/capi.h
 include/libunicode/codepoint_properties.h
 include/libunicode/convert.h
 include/libunicode/emoji_segmenter.h
 include/libunicode/grapheme_segmenter.h
 include/libunicode/intrinsics.h
 include/libunicode/multistage_table_generator.h
 include/libunicode/multistage_table_view.h
 include/libunicode/run_segmenter.h
 include/libunicode/scan.h
 include/libunicode/scoped_timer.h
 include/libunicode/script_segmenter.h
 include/libunicode/support.h
 include/libunicode/ucd.h
 include/libunicode/ucd_enums.h
 include/libunicode/ucd_fmt.h
 include/libunicode/ucd_ostream.h
 include/libunicode/utf8.h
 include/libunicode/utf8_grapheme_segmenter.h
 include/libunicode/width.h
 include/libunicode/word_segmenter.h
 lib/cmake/libunicode/libunicode-config-version.cmake
 lib/cmake/libunicode/libunicode-config.cmake
 lib/cmake/libunicode/libunicode-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/libunicode/libunicode-targets.cmake
 lib/contour/libunicode.so
-lib/contour/libunicode.so.0.6
-lib/contour/libunicode.so.0.6.0
+lib/contour/libunicode.so.%%SOVERSION_MAJOR_MINOR%%
+lib/contour/libunicode.so.%%SOVERSION_FULL%%
 lib/contour/libunicode_loader.so
-lib/contour/libunicode_loader.so.0.6
-lib/contour/libunicode_loader.so.0.6.0
+lib/contour/libunicode_loader.so.%%SOVERSION_MAJOR_MINOR%%
+lib/contour/libunicode_loader.so.%%SOVERSION_FULL%%
 lib/contour/libunicode_ucd.so
-lib/contour/libunicode_ucd.so.0.6
-lib/contour/libunicode_ucd.so.0.6.0
+lib/contour/libunicode_ucd.so.%%SOVERSION_MAJOR_MINOR%%
+lib/contour/libunicode_ucd.so.%%SOVERSION_FULL%%