diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 48d95ee8a3e7..4c6bb0e29c11 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -1,63 +1,71 @@
 PORTNAME=	scite
-DISTVERSION=	5.5.0
+DISTVERSION=	5.5.8
 CATEGORIES=	editors gnome
 MASTER_SITES=	https://www.scintilla.org/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
-COMMENT=	Full-featured SCIntilla based text editor for GTK/GNOME
+COMMENT=	Full-featured SCIntilla based Text Editor for GTK/GNOME
 WWW=		https://www.scintilla.org/SciTE.html
 
 LICENSE=	SCINTILLA
 LICENSE_NAME=	License for Lexilla, Scintilla and SciTE
-LICENSE_FILE=	${WRKSRC}/../License.txt
+LICENSE_FILE=	${WRKSRC}/scite/License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	liblexilla.so:textproc/lexilla \
-		libscintilla.so:x11-toolkits/scintilla
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++20-lang desktop-file-utils gmake gnome pkgconfig \
 		tar:tgz
 
-USE_GNOME=	cairo gdkpixbuf gtk30
+USE_GNOME=	cairo gdkpixbuf gdkpixbufextra gtk30
 MAKEFILE=	makefile
 MAKE_ARGS=	GTK3=1
 .if defined(WITH_DEBUG)
 MAKE_ARGS+=	DEBUG=1
 .endif
 
-PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
+WRKSRC=		${WRKDIR}
 
 PORTDATA=	*.properties
 PORTDOCS=	*.html *.jpg *.png
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 MAKE_ARGS+=	CLANG=1
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(SciteDefaultHome)|${DOCSDIR}|' \
-		${WRKSRC}/../src/SciTEGlobal.properties
+		${WRKSRC}/scite/src/SciTEGlobal.properties
 
+# SciTE's built process is to build, in order: Lexilla, Scintilla, then SciTE
+# SciTE's Makefile doesn't do the first two, so I just do all 3 manually here.
+do-build:
+	cd ${WRKSRC}/lexilla/src && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
+	cd ${WRKSRC}/scintilla/gtk && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
+	cd ${WRKSRC}/scite/gtk && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
+
+# SciTE's install target does not do a very good job of things, so this section is
+# mostly to do all the parts it doesn't do.
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE \
-		${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC}/scite/gtk && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/SciTE \
+		${STAGEDIR}${PREFIX}/lib/scite/libscintilla.so \
+		${STAGEDIR}${PREFIX}/lib/scite/liblexilla.so
 	${LN} -sf SciTE ${STAGEDIR}${PREFIX}/bin/scite
-	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 \
+	${INSTALL_MAN} ${WRKSRC}/scite/doc/scite.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop \
-		${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/Sci48M.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps
-	(cd ${WRKSRC}/../src && \
+	(cd ${WRKSRC}/scite/src && \
 		${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
-	(cd ${WRKSRC}/../doc && \
+	(cd ${WRKSRC}/scite/doc && \
 		${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.post.mk>
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index dbe2f170c3fe..94439b7ae104 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719371126
-SHA256 (scite550.tgz) = f7726a57be521f71c81b4fcc6d171fbf4a62e08c1c1840f5a74e014f3607ee11
-SIZE (scite550.tgz) = 4784815
+TIMESTAMP = 1770626704
+SHA256 (scite558.tgz) = abd5eec4f97de9d746bca0f719b89ccb84a1c7ee5bd37fecc4b8c913b6968d21
+SIZE (scite558.tgz) = 4909612
diff --git a/editors/scite/files/patch-gtk_makefile b/editors/scite/files/patch-gtk_makefile
deleted file mode 100644
index 7bb9535a50b6..000000000000
--- a/editors/scite/files/patch-gtk_makefile
+++ /dev/null
@@ -1,33 +0,0 @@
---- gtk/makefile.orig	2024-03-19 04:36:42 UTC
-+++ gtk/makefile
-@@ -19,9 +19,7 @@ SANITIZE = address
- # thread also need to create Position Independent Executable -> search online documentation
- SANITIZE = address
- #SANITIZE = undefined
--CXX = clang++
--CC = clang
--BASE_FLAGS += -fsanitize=$(SANITIZE)
-+#BASE_FLAGS += -fsanitize=$(SANITIZE)
- WARNINGS += -Wno-deprecated-register
- WARNINGS += -Wno-empty-body
- else
-@@ -60,7 +58,7 @@ LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
- COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
- LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
- 
--all: $(PROG) $(COMPONENT) $(LEXILLA)
-+all: $(PROG)
- 
- vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_DIR)/include
- vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../../lexilla/access $(SCINTILLA_DIR)/call
-@@ -156,7 +154,9 @@ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o Directo
- 	Utf8_16.o
- 
- $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
--	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
-+	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--undefined-version \
-+	-Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers \
-+	$^ -o $@ $(CONFIGLIB) $(LIBS) -lscintilla -llexilla $(LDLIBS)
- 
- # Automatically generate header dependencies with "make depend"
- include deps.mak
diff --git a/editors/scite/files/patch-lexilla_src_makefile b/editors/scite/files/patch-lexilla_src_makefile
new file mode 100644
index 000000000000..7b0c4aa5faa9
--- /dev/null
+++ b/editors/scite/files/patch-lexilla_src_makefile
@@ -0,0 +1,10 @@
+--- lexilla/src/makefile.orig	2025-06-07 23:27:16 UTC
++++ lexilla/src/makefile
+@@ -44,7 +44,6 @@ ifdef CLANG
+ BASE_FLAGS += --std=c++17
+ 
+ ifdef CLANG
+-CXX = clang++
+ ifdef windir
+ # Clang on Win32 uses MSVC headers so will complain about strcpy without this
+ DEFINES += -D_CRT_SECURE_NO_DEPRECATE=1
diff --git a/editors/scite/files/patch-scintilla_gtk_makefile b/editors/scite/files/patch-scintilla_gtk_makefile
new file mode 100644
index 000000000000..c1ea37c7bf71
--- /dev/null
+++ b/editors/scite/files/patch-scintilla_gtk_makefile
@@ -0,0 +1,20 @@
+--- scintilla/gtk/makefile.orig	2024-03-19 04:36:37 UTC
++++ scintilla/gtk/makefile
+@@ -16,8 +16,6 @@ ifdef CLANG
+ 
+ WARNINGS = -Wpedantic -Wall
+ ifdef CLANG
+-CXX = clang++
+-CC = clang
+ WARNINGS += -Wno-deprecated-register
+ ifdef windir
+ # Turn off some warnings that occur when Clang is being used on Windows where it
+@@ -34,7 +32,7 @@ SANITIZE = address
+ # thread also need to create Position Independent Executable -> search online documentation
+ SANITIZE = address
+ #SANITIZE = undefined
+-BASE_FLAGS += -fsanitize=$(SANITIZE)
++#BASE_FLAGS += -fsanitize=$(SANITIZE)
+ endif
+ ARFLAGS = rc
+ RANLIB ?= ranlib
diff --git a/editors/scite/files/patch-scite_gtk_makefile b/editors/scite/files/patch-scite_gtk_makefile
new file mode 100644
index 000000000000..7cff75c1e051
--- /dev/null
+++ b/editors/scite/files/patch-scite_gtk_makefile
@@ -0,0 +1,36 @@
+--- scite/gtk/makefile.orig	2024-03-19 04:36:42 UTC
++++ scite/gtk/makefile
+@@ -19,9 +19,7 @@ SANITIZE = address
+ # thread also need to create Position Independent Executable -> search online documentation
+ SANITIZE = address
+ #SANITIZE = undefined
+-CXX = clang++
+-CC = clang
+-BASE_FLAGS += -fsanitize=$(SANITIZE)
++#BASE_FLAGS += -fsanitize=$(SANITIZE)
+ WARNINGS += -Wno-deprecated-register
+ WARNINGS += -Wno-empty-body
+ else
+@@ -156,7 +154,7 @@ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o Directo
+ 	Utf8_16.o
+ 
+ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
+-	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
++	$(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--undefined-version -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
+ 
+ # Automatically generate header dependencies with "make depend"
+ include deps.mak
+@@ -172,10 +170,9 @@ install:
+ 	$(INSTALL) -m 755 $(COMPONENT) $(DESTDIR)$(libdir)
+ 	$(INSTALL) -m 755 $(LEXILLA) $(DESTDIR)$(libdir)
+ 
+-	for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png $(srcdir)/../doc/SciTEIndicators.png; \
+-	do \
+-		$(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
+-	done
++#	for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png $(srcdir)/../doc/SciTEIndicators.png; \	#do \
++#		$(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
++#	done
+ 
+ ifdef gnomeprefix
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index dc7e91e8605d..dcb8401e804d 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -1,5 +1,7 @@
 bin/SciTE
 bin/scite
-share/man/man1/scite.1.gz
+lib/scite/liblexilla.so
+lib/scite/libscintilla.so
 share/applications/SciTE.desktop
+share/man/man1/scite.1.gz
 share/pixmaps/Sci48M.png