diff --git a/www/typo3-12/Makefile b/www/typo3-12/Makefile
index e3f1a6397063..f8d459508b0c 100644
--- a/www/typo3-12/Makefile
+++ b/www/typo3-12/Makefile
@@ -1,74 +1,73 @@
 PORTNAME=	typo3
 DISTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
 CATEGORIES=	www
 MASTER_SITES=	https://typo3.azureedge.net/typo3/${DISTVERSION}/
 PKGNAMESUFFIX=	-${PORT_V_MAJOR}${PHP_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}_src-${DISTVERSION}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
 COMMENT=	Typo3 content management system
 WWW=		https://typo3.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cpe php:web,flavors shebangfix
 # php openssl extension is required but it's statically linked in default php
 USE_PHP=	ctype dom fileinfo filter gd intl mbstring pdo session \
 		simplexml tokenizer xml zip zlib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}_src-${PORTVERSION}
 SHEBANG_GLOB=	*.php *.sh
 NO_ARCH=	yes
 NO_BUILD=	yes
 PORTSCOUT=	limit:^${PORT_V_MAJOR}\.${PORT_V_MINOR}\.
 SUB_FILES=	pkg-message
 SUB_LIST+=	PREFIX=${PREFIX} \
 		TYPO3DIR=${TYPO3DIR} \
 		TYPO3WWW=${TYPO3WWW}
+WRKSRC=		${WRKDIR}/${PORTNAME}_src-${PORTVERSION}
 
 PORT_V_MAJOR=	12
 PORT_V_MINOR=	4
-PORT_V_PATCH=	16
+PORT_V_PATCH=	17
 
 TYPO3DIR=	www/${PORTNAME}-${PORT_V_MAJOR}
 
-OPTIONS_DEFINE=		CURL GMP IMAGICK MYSQL POSTGRES SQLITE
+OPTIONS_DEFINE=		CURL GMP IMAGICK MYSQL POSTGRES SQLITE X11
 OPTIONS_DEFAULT=	MYSQL
 
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
-MBSTRING_DESC=	${MULTIBYTE_DESC}
 MYSQL_DESC=	Use MySQL as DBMS
 POSTGRES_DESC=	Use PostgreSQL as DBMS
 SQLITE_DESC=	Use SQLite as DBMS
 
 CURL_USE=	PHP=curl
 GMP_USE=	PHP=gmp
 MYSQL_USE=	PHP=mysqli
 POSTGRES_USE=	PHP=pgsql
 SQLITE_USE=	PHP=sqlite3
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
 USES+=		magick:7,run
 .else
 USES+=		magick:7,run,nox11
 .endif
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${TYPO3DIR}
 
 post-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@mode 755" >> ${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${TYPO3DIR}?g" >>${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${TYPO3DIR}?g" >> ${TMPPLIST}
 	@${ECHO_CMD} "@mode" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/typo3-12/distinfo b/www/typo3-12/distinfo
index b30a64cb6880..3839e6388d84 100644
--- a/www/typo3-12/distinfo
+++ b/www/typo3-12/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718204343
-SHA256 (typo3_src-12.4.16.tar.gz) = ca7e07d9e8f0b6da5131288bd6543c5e57c21caceccf0a4058db8f61ba667268
-SIZE (typo3_src-12.4.16.tar.gz) = 26167307
+TIMESTAMP = 1720712494
+SHA256 (typo3_src-12.4.17.tar.gz) = 5ef12cce1137e6a7aa17883ad4c25df783e049abec7d22ad2c72bc2bcf5e5816
+SIZE (typo3_src-12.4.17.tar.gz) = 26183515
diff --git a/www/typo3-12/pkg-descr b/www/typo3-12/pkg-descr
index a21d2f94225b..028508865fef 100644
--- a/www/typo3-12/pkg-descr
+++ b/www/typo3-12/pkg-descr
@@ -1,13 +1,13 @@
-This is the stable version with long-term support (LTS). We provide free maintenance
-bug fixes until October 2024 and security updates until April 2026.
+This is the stable version with long-term support (LTS). We provide free
+maintenance bug fixes until October 2024 and security updates until April 2026.
 * Increased performance
 * Improved backend usability
 * Top-modern dependent libraries (CKEditor v5, Symfony v6, Doctrine v3)
 * And many improvements for developers
 
 System requirements
 * PHP 8.1, 8.2, 8.3
 * MariaDB 10.3+ / MySQL 8.0+ / PostgreSQL 10.0+ / SQLite 3.8.3+
 * Modern Browsers
 * Detailed list of requirements:
 	https://get.typo3.org/version/12#system-requirements