diff --git a/x11/contour/Makefile b/x11/contour/Makefile
index 29bba74e3697..f1bdc24388e6 100644
--- a/x11/contour/Makefile
+++ b/x11/contour/Makefile
@@ -1,77 +1,78 @@
 PORTNAME=	contour
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.3.8249
+DISTVERSION=	0.7.0.8982
 CATEGORIES=	x11
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Modern C++ terminal emulator
 WWW=		https://contour-terminal.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/cmake/boxed-cpp/boxed-cpp-config.cmake:devel/boxed-cpp \
 		${LOCALBASE}/lib/cmake/reflection-cpp/reflection-cpp-config.cmake:devel/reflection-cpp \
 		${LOCALBASE}/share/cmake/Microsoft.GSL/Microsoft.GSLConfig.cmake:devel/microsoft-gsl \
 		${LOCALBASE}/lib/cmake/range-v3/range-v3-config.cmake:devel/range-v3 \
 		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libunicode.so:devel/libunicode-contour \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libssh2.so:security/libssh2 \
-		libfontconfig.so:x11-fonts/fontconfig
+		libfontconfig.so:x11-fonts/fontconfig \
+		libxkbcommon.so:x11/libxkbcommon
 TEST_DEPENDS=	${LOCALBASE}/lib/cmake/Catch2/Catch2Config.cmake:devel/catch2
 
 USES=		cmake:testing compiler desktop-file-utils gl gnome pkgconfig \
-		qt:6 xorg
+		qt:6 ssl xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	contour-terminal
 
 USE_XORG=	xcb
 USE_GL=		opengl
 USE_GNOME=	cairo
-USE_QT=		base declarative multimedia tools:build
+USE_QT=		base declarative multimedia speech tools:build
 
 CMAKE_ON=		CONTOUR_INSTALL_TOOLS
 CMAKE_OFF=		CONTOUR_USE_CPM
 CMAKE_TESTING_ON=	CONTOUR_TESTING
 
 PORTDOCS=	README.md SECURITY.md
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${ARCH} == i386
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_crispy_read__selector.h
+.if ${ARCH} == i386
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_crispy_ReadSelector.hpp
 .endif
 
 .if ${ARCH:Mpowerpc*}
 USES+=		compiler:gcc-c++11-lib
 .endif
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
 		${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/src/contour/shell-integration/shell-integration.bash \
+	${INSTALL_DATA} ${WRKSRC}/src/contour/cli/shell-integration/shell-integration.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/src/contour/shell-integration/shell-integration.fish \
+	${INSTALL_DATA} ${WRKSRC}/src/contour/cli/shell-integration/shell-integration.fish \
 		${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish
-	${INSTALL_DATA} ${WRKSRC}/src/contour/shell-integration/shell-integration.zsh \
+	${INSTALL_DATA} ${WRKSRC}/src/contour/cli/shell-integration/shell-integration.zsh \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
 
 # XXX COMPILER_TYPE is defined after USES was already parsed
 .if ${CHOSEN_COMPILER_TYPE} == clang && ${_CCVERSION:M+assertions}
 llvm_ARGS=	build
 .include "${USESDIR}/llvm.mk"
 .endif
diff --git a/x11/contour/distinfo b/x11/contour/distinfo
index ce132683c9e5..b244d262cbb8 100644
--- a/x11/contour/distinfo
+++ b/x11/contour/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1776673548
-SHA256 (contour-terminal-contour-v0.6.3.8249_GH0.tar.gz) = 9354ae9ef1c1df17febf095033f965fe81d173beed3445aae86a5a07bb75cbce
-SIZE (contour-terminal-contour-v0.6.3.8249_GH0.tar.gz) = 13655409
+TIMESTAMP = 1787113394
+SHA256 (contour-terminal-contour-v0.7.0.8982_GH0.tar.gz) = 9afaaed7f705c56e413938f43d338c7700ca69122a531d94c10c8eb9f5a44c28
+SIZE (contour-terminal-contour-v0.7.0.8982_GH0.tar.gz) = 15946050
diff --git a/x11/contour/files/extra-patch-src_crispy_read__selector.h b/x11/contour/files/extra-patch-src_crispy_ReadSelector.hpp
similarity index 53%
rename from x11/contour/files/extra-patch-src_crispy_read__selector.h
rename to x11/contour/files/extra-patch-src_crispy_ReadSelector.hpp
index c8e21f8dd3ba..19616983b76f 100644
--- a/x11/contour/files/extra-patch-src_crispy_read__selector.h
+++ b/x11/contour/files/extra-patch-src_crispy_ReadSelector.hpp
@@ -1,11 +1,11 @@
---- src/crispy/read_selector.h.orig	2026-01-06 17:41:07 UTC
-+++ src/crispy/read_selector.h
-@@ -107,7 +107,7 @@ class posix_read_selector
+--- src/crispy/ReadSelector.hpp.orig	2026-08-19 07:00:03 UTC
++++ src/crispy/ReadSelector.hpp
+@@ -131,7 +131,7 @@ class PosixReadSelector
          if (timeout.has_value())
          {
              tv = std::make_unique<timeval>(
 -                timeval { .tv_sec = timeout->count() / 1000,
-+                timeval { .tv_sec = static_cast<int>(timeout->count() / 1000),
++                timeval { .tv_sec = static_cast<time_t>(timeout->count() / 1000),
                            .tv_usec = static_cast<int>((timeout->count() % 1000) * 1000) });
          }