Index: Makefile
===================================================================
--- Makefile	(revision 484382)
+++ Makefile	(working copy)
@@ -13,20 +13,20 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-IGNORE_WITH_PHP=	56
+IGNORE_WITH_PHP=56 70
 
-PORTSCOUT=	limit:^${PORT_V_MAJOR}\.${PORT_V_MINOR}\.
+USES=		cpe php:web,flavors shebangfix
+USE_PHP=	ctype dom fileinfo filter hash intl json mysqli openssl pcre session spl soap xml zip
 
-USES=		cpe php:web,flavors shebangfix
-SHEBANG_GLOB=	*.sh *.php
+WRKSRC=		${WRKDIR}/${TYPO3SRC}
 NO_BUILD=	yes
 NO_ARCH=	yes
-USE_PHP=	ctype fileinfo filter hash json mysqli openssl pcre session soap xml zip simplexml
-WRKSRC=		${WRKDIR}/${TYPO3SRC}
+SHEBANG_GLOB=	*.sh *.php
+PORTSCOUT=	limit:^${PORT_V_MAJOR}\.${PORT_V_MINOR}\.
 
-PORT_V_MAJOR=	8
-PORT_V_MINOR=	7
-PORT_V_PATCH=	20
+PORT_V_MAJOR=	9
+PORT_V_MINOR=	5
+PORT_V_PATCH=	1
 
 TYPO3WWW=	www
 TYPO3SRC=	${PORTNAME}_src-${PORTVERSION}
@@ -42,7 +42,7 @@
 
 DISTFILES+=	${TYPO3SRC}${EXTRACT_SUFX}
 
-OPTIONS_DEFINE=	CURL GD GMP IMAGICK MBSTRING MYSQL ZLIB
+OPTIONS_DEFINE=	CURL GD GMP IMAGICK MBSTRING MYSQL POSTGRES SQLSRV SQLITE ZLIB
 OPTIONS_DEFAULT=
 GD_DESC=	GDlib/freetype support
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
@@ -54,6 +54,9 @@
 GMP_USE=	PHP=gmp
 MBSTRING_USE=	PHP=mbstring
 MYSQL_USE=	MYSQL=server
+POSTGRES_USE=	PHP=postgresql
+SQLSRV_USE=	PHP=sqlsrv
+SQLITE_USE=	PHP=sqlite
 ZLIB_USE=	PHP=zlib
 
 .include <bsd.port.options.mk>
@@ -72,19 +75,16 @@
 	${LN} -fs ../${TYPO3SRC} ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/typo3_src
 	${LN} -fs typo3_src/index.php ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/index.php
 	${LN} -fs typo3_src/typo3 ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/typo3
-	${CP} ${WRKDIR}/${TYPO3SRC}/_.htaccess ${STAGEDIR}${PREFIX}/${TYPO3WWW}/${TYPO3DIR}/.htaccess
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX}; \
 		${FIND} * \( -type f -or -type l \) -path "${TYPO3WWW}/${TYPO3DIR}/*" | \
-		${SORT} >> ${TMPPLIST}
+		${SORT} >> ${TMPPLIST}; \
+		${ECHO} "@owner ${WWWOWN}" >> ${TMPPLIST}; \
+		${ECHO} "@dir ${TYPO3WWW}/${TYPO3DIR}" >> ${TMPPLIST}
 	@cd ${STAGEDIR}${PREFIX}; \
+		${ECHO} "@owner" >> ${TMPPLIST}; \
 		${FIND} * \( -type f -or -type l \) -path "${TYPO3WWW}/${TYPO3SRC}/*" | \
 		${SORT} >> ${TMPPLIST}
 
-	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/common/lib/vendor/doctrine-build-common" >> ${TMPPLIST}
-	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/Symfony/Component/Console" >> ${TMPPLIST}
-	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/doctrine-build-common" >> ${TMPPLIST}
-	@${ECHO} "@dir ${TYPO3WWW}/${TYPO3SRC}/vendor/doctrine/dbal/lib/vendor/doctrine-common" >> ${TMPPLIST}
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 484382)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541006106
-SHA256 (typo3_src-8.7.20.tar.gz) = b33d49d2c20c247c16be5fef36c714dde054a138a17687f3b992225797de7b77
-SIZE (typo3_src-8.7.20.tar.gz) = 19429537
+TIMESTAMP = 1541599834
+SHA256 (typo3_src-9.5.1.tar.gz) = bf5472f2adbbb3e32851c21be32516a28e704e2509e0ea341d73a760a7cfcb07
+SIZE (typo3_src-9.5.1.tar.gz) = 26991695
Index: files/pkg-message.in
===================================================================
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 484382)
+++ pkg-descr	(working copy)
@@ -2,8 +2,9 @@
 on the web and in intranets. It offers full flexibility and extendability while
 featuring an accomplished set of ready-made interfaces, functions and modules.
 
-The old stable LTS release (for all new projects)
-The old version with Long Term Support (LTS). It will have maintenance and
-security-related bugfixes until March 2020.
+The current stable LTS release (for all new projects).
+The latest version with Long Term Support (LTS).
+It will have full support until April 2020 and security-related bugfixes
+until September 2021.
 
 WWW: https://typo3.org/