diff --git a/editors/sciteco/Makefile b/editors/sciteco/Makefile
index 3ca31829235f..65e87ae26474 100644
--- a/editors/sciteco/Makefile
+++ b/editors/sciteco/Makefile
@@ -1,92 +1,98 @@
 PORTNAME=	sciteco
-DISTVERSION=	2.2.0
+DISTVERSION=	2.5.2
 CATEGORIES=	editors textproc devel
-MASTER_SITES=	https://github.com/rhaberkorn/${PORTNAME}/releases/download/v${DISTVERSION}/ \
+MASTER_SITES=	https://sciteco.fmsbw.de/downloads/v${DISTVERSION}/ \
 		SOURCEFORGE/${PORTNAME}/v${DISTVERSION}/
 
-MAINTAINER=	robin.haberkorn@googlemail.com
+MAINTAINER=	rhaberkorn@fmsbw.de
 COMMENT=	Scintilla-based Text Editor and Corrector
-WWW=		https://rhaberkorn.github.io/sciteco/
+WWW=		https://sciteco.fmsbw.de/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 FLAVORS=		curses gtk
 FLAVOR?=		${FLAVORS:[1]}
 curses_PKGNAMESUFFIX=	-curses
 gtk_PKGNAMESUFFIX=	-gtk
 
 # As SciTECO uses itself during the build process,
 # it makes sense to compile it running under a dummy XServer.
 # This is both faster and works in headless environments as well.
 gtk_BUILD_DEPENDS=	mcookie:sysutils/util-linux \
 			xauth:x11/xauth \
 			Xvfb:x11-servers/xorg-server@xvfb
 
 USES=		compiler:c11 gmake gnome groff pkgconfig
 USE_GNOME=	glib20
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=
 CONFIGURE_OUTSOURCE=	yes
 
 MAKEFILE=	GNUmakefile
 TEST_TARGET=	check
 
 # NOTE: Unlike on Debian, we cannot build a sciteco-common package.
 # FreeBSD does not yet support subpackages.
 # Therefore both flavors will install totally independant
 # (partially redundant) files.
 .if ${FLAVOR} == gtk
 DATADIR=	${PREFIX}/share/gsciteco
 .endif
 
 SUB_FILES=	pkg-message
 
 .if ${FLAVOR} == curses
 USES+=			ncurses
 CONFIGURE_ARGS+=	--with-interface=ncurses
 PLIST_SUB+=		GTK="@comment " \
 			PROGRAM_PREFIX=""
 .elif ${FLAVOR} == gtk
 USES+=			desktop-file-utils
 # FIXME: To appease QA checks, we would have to
 # USE_GNOME+=cairo gdkpixbuf and
 # gtk_LIB_DEPENDS+=libharfbuzz.so:print/harfbuzz
 USE_GNOME+=		gtk30
 CONFIGURE_ARGS+=	--program-prefix=g \
 			--with-interface=gtk \
 			--with-scitecodatadir="${DATADIR}"
 PLIST_SUB+=		GTK="" \
 			PROGRAM_PREFIX=g
 .endif
 
-OPTIONS_DEFINE=		LEXILLA MALLOC_REPLACEMENT TECO_INTEGER_32
-OPTIONS_DEFAULT=	LEXILLA
+OPTIONS_DEFINE=		LEXILLA MALLOC_REPLACEMENT TECO_INTEGER_32 LTO
+OPTIONS_DEFAULT=	LEXILLA MALLOC_REPLACEMENT
 OPTIONS_SUB=		yes
 
 LEXILLA_DESC=			Build with Lexilla lexer support (larger)
-MALLOC_REPLACEMENT_DESC=	Force replacement of system malloc()
+MALLOC_REPLACEMENT_DESC=	Replace system malloc() for memory limiting
 TECO_INTEGER_32_DESC=		Use 32-bit TECO integers
+LTO_DESC=			Apply Link-Time Optimizations (significantly faster)
 
 LEXILLA_CONFIGURE_OFF=			--without-lexilla
 MALLOC_REPLACEMENT_CONFIGURE_ON=	--enable-malloc-replacement
 TECO_INTEGER_32_CONFIGURE_ON=		--with-teco-integer=32
 
+# Once we support an --enable-lto site-config-option, we should rather use that.
+LTO_CFLAGS=	-flto=thin
+LTO_CXXFLAGS=	-flto=thin
+LTO_LDFLAGS=	-flto=thin
+
 .include <bsd.port.pre.mk>
 
 .if ${FLAVOR} == gtk
 MAKE_CMD=	${SH} ${FILESDIR}/xvfb-run.sh ${GMAKE}
 .endif
 
 post-install:
 .for SZ in 16 32 48 256
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps
 	${INSTALL_DATA} ${WRKSRC}/ico/sciteco-${SZ}.png \
 			${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/sciteco.png
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/src/sciteco.desktop \
 			${STAGEDIR}${PREFIX}/share/applications/sciteco.desktop
 
 .include <bsd.port.post.mk>
diff --git a/editors/sciteco/distinfo b/editors/sciteco/distinfo
index f0688b473d78..9396b55ef41f 100644
--- a/editors/sciteco/distinfo
+++ b/editors/sciteco/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733772734
-SHA256 (sciteco-2.2.0.tar.gz) = 57ad450623761b76ee8742686db9dd9aae9c1436944e982c36dd368dbbf82020
-SIZE (sciteco-2.2.0.tar.gz) = 3989774
+TIMESTAMP = 1776638070
+SHA256 (sciteco-2.5.2.tar.gz) = 94149fa3371e3adff723ae933502b5983804c4e06a681c6d00b0af19c439a978
+SIZE (sciteco-2.5.2.tar.gz) = 4113973
diff --git a/editors/sciteco/files/pkg-message.in b/editors/sciteco/files/pkg-message.in
index b91ee0683782..7d95cdb92827 100644
--- a/editors/sciteco/files/pkg-message.in
+++ b/editors/sciteco/files/pkg-message.in
@@ -1,9 +1,9 @@
 [
 {	type: install
 	message: <<XYZZY
-You are recommended to copy %%DATADIR%%/sample.teco_ini to ~/.teco_ini
+You can copy %%DATADIR%%/fallback.teco_ini to ~/.teco_ini
 and edit this file afterwards with SciTECO.
 XYZZY
 }
 ]
 
diff --git a/editors/sciteco/pkg-plist b/editors/sciteco/pkg-plist
index 9979f5c789c9..dd3e7cba247b 100644
--- a/editors/sciteco/pkg-plist
+++ b/editors/sciteco/pkg-plist
@@ -1,113 +1,125 @@
 bin/%%PROGRAM_PREFIX%%grosciteco.tes
 bin/%%PROGRAM_PREFIX%%sciteco
 bin/%%PROGRAM_PREFIX%%tedoc.tes
 share/man/man1/%%PROGRAM_PREFIX%%grosciteco.tes.1.gz
 share/man/man1/%%PROGRAM_PREFIX%%sciteco.1.gz
 share/man/man1/%%PROGRAM_PREFIX%%tedoc.tes.1.gz
 share/man/man7/%%PROGRAM_PREFIX%%sciteco.7.gz
 %%DATADIR%%/lib/color.tes
+%%DATADIR%%/lib/colors/contrast.tes
 %%DATADIR%%/lib/colors/solarized.tes
 %%DATADIR%%/lib/colors/terminal.tes
 %%DATADIR%%/lib/fnkeys.tes
 %%DATADIR%%/lib/getopt.tes
 %%DATADIR%%/lib/lexer.tes
-%%DATADIR%%/sciteco-16.png
-%%DATADIR%%/sciteco-32.png
-%%DATADIR%%/sciteco-48.png
+%%DATADIR%%/lib/repl.tes
+%%DATADIR%%/lib/tank.tes
+%%DATADIR%%/lib/tecat.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/abaqus.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/ada.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/asciidoc.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/asl.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/asm.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/ave.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/avs.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/awk.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/baan.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/bash.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/batch.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/blitzbasic.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/c.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/caml.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/ch.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/cmake.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/cobol.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/cpp.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/cs.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/css.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/d.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/devicetree.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/diff.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/docbook.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/eiffel.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/f77.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/f95.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/flagship.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/flash.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/freebasic.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/gap.tes
-%%LEXILLA%%%%DATADIR%%/lib/lexers/git.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/go.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/gob.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/html.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/idl.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/inno.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/java.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/js.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/kix.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/latex.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/lisp.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/lout.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/lua.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/make.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/mako.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/markdown.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/matlab.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/mmixal.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/octave.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/oscript.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/pascal.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/perl.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/php.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/pike.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/pov.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/powerpro.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/purebasic.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/python.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/r.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/rc.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/rebol.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/rust.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/scheme.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/specman.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/spice.tes
+%%LEXILLA%%%%DATADIR%%/lib/lexers/sql.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/swift.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/systemverilog.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/tacl.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/tal.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/tcl.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/test.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/troff.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/vala.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/vb.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/verilog.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/vhdl.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/vxml.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/xml.tes
 %%LEXILLA%%%%DATADIR%%/lib/lexers/yaml.tes
+%%DATADIR%%/lib/lexers/email.tes
+%%DATADIR%%/lib/lexers/git.tes
+%%DATADIR%%/lib/lexers/sciteco.tes
 %%DATADIR%%/lib/lexers/woman.tes
+%%DATADIR%%/lib/opener.tes
 %%DATADIR%%/lib/session.tes
 %%DATADIR%%/lib/string.tes
 %%DATADIR%%/lib/women/grosciteco.tes.1.woman
 %%DATADIR%%/lib/women/grosciteco.tes.1.woman.tec
 %%DATADIR%%/lib/women/sciteco.1.woman
 %%DATADIR%%/lib/women/sciteco.1.woman.tec
 %%DATADIR%%/lib/women/sciteco.7.woman
 %%DATADIR%%/lib/women/sciteco.7.woman.tec
 %%DATADIR%%/lib/women/tedoc.tes.1.woman
 %%DATADIR%%/lib/women/tedoc.tes.1.woman.tec
-%%DATADIR%%/sample.teco_ini
+%%DATADIR%%/lib/women/tutorial.woman
+%%DATADIR%%/lib/women/tutorial.woman.tec
+%%DATADIR%%/fallback.teco_ini
 %%DATADIR%%/sciteco.tmac
+%%GTK%%%%DATADIR%%/sciteco-16.png
+%%GTK%%%%DATADIR%%/sciteco-32.png
+%%GTK%%%%DATADIR%%/sciteco-48.png
 %%GTK%%%%DATADIR%%/fallback.css
 %%GTK%%share/icons/hicolor/16x16/apps/sciteco.png
 %%GTK%%share/icons/hicolor/32x32/apps/sciteco.png
 %%GTK%%share/icons/hicolor/48x48/apps/sciteco.png
 %%GTK%%share/icons/hicolor/256x256/apps/sciteco.png
 %%GTK%%share/applications/sciteco.desktop