diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index f561bee0a3a7..2c4ab991ed7a 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	sigil
-PORTVERSION=	2.2.1
+DISTVERSION=	2.3.0
 CATEGORIES=	textproc
 
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	WYSIWYG ePub editor
 WWW=		https://sigil-ebook.com/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	libpcre2-16.so:devel/pcre2 \
 		libhunspell-1.7.so:textproc/hunspell \
 		libGLX.so:graphics/libglvnd
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dulwich>=0.15.0:devel/py-dulwich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR}
 
 USES=		cmake cpe desktop-file-utils \
 		minizip pkgconfig python qt:6 shebangfix
 CPE_VENDOR=	${PORTNAME}-ebook
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Sigil-Ebook
 GH_PROJECT=	Sigil
 
 USE_LDCONFIG=	${PREFIX}/lib/sigil
 
-USE_QT=		base 5compat declarative \
-		svg tools:build positioning webchannel webengine \
-		imageformats:run
+USE_QT=		base declarative positioning svg webchannel webengine \
+		tools:build imageformats:run
 
 SHEBANG_FILES=	src/Resource_Files/plugin_launchers/python/*.py \
 		src/Resource_Files/python3lib/*.py
 
-CMAKE_ARGS=	-DUSE_SYSTEM_LIBS:BOOL=1 -DUSE_QT6=1
+CMAKE_ARGS=	-DUSE_SYSTEM_LIBS:BOOL=1
 
 # Upstream uses pkg-config output to pass libhunspell-1.7.so and
 # libpcre16.so to the linker. pkg-config output does not include full
 # paths, so add a workaround to keep the port linking for now.
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/sigil/*.so
 
 .include <bsd.port.mk>
diff --git a/textproc/sigil/distinfo b/textproc/sigil/distinfo
index 9943c1fc0b16..3ab08071ed1a 100644
--- a/textproc/sigil/distinfo
+++ b/textproc/sigil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719356307
-SHA256 (Sigil-Ebook-Sigil-2.2.1_GH0.tar.gz) = 0f491d703424557b5829d60e08ac17747735d54c14a92c470f448515caf4bfb1
-SIZE (Sigil-Ebook-Sigil-2.2.1_GH0.tar.gz) = 26131954
+TIMESTAMP = 1723846128
+SHA256 (Sigil-Ebook-Sigil-2.3.0_GH0.tar.gz) = 640e637ce234c564aa746bbc9d7b04aab4571b294f1282e5237e6765cd39551b
+SIZE (Sigil-Ebook-Sigil-2.3.0_GH0.tar.gz) = 17480782
diff --git a/textproc/sigil/pkg-plist b/textproc/sigil/pkg-plist
index 9bfde68c3e15..324550442a19 100644
--- a/textproc/sigil/pkg-plist
+++ b/textproc/sigil/pkg-plist
@@ -1,110 +1,308 @@
 bin/sigil
 lib/sigil/libsigilgumbo.so
 lib/sigil/sigil
 share/applications/sigil.desktop
 share/pixmaps/sigil.png
 %%DATADIR%%/examples/clip_entries.ini
 %%DATADIR%%/examples/search_entries.ini
 %%DATADIR%%/hunspell_dictionaries/About.txt
 %%DATADIR%%/hunspell_dictionaries/COPYING_GPLv2.txt
 %%DATADIR%%/hunspell_dictionaries/COPYING_GPLv3.txt
 %%DATADIR%%/hunspell_dictionaries/COPYING_LGPL_v2.0.txt
 %%DATADIR%%/hunspell_dictionaries/COPYING_LGPL_v2.1.txt
 %%DATADIR%%/hunspell_dictionaries/License_es.md
 %%DATADIR%%/hunspell_dictionaries/README.txt
 %%DATADIR%%/hunspell_dictionaries/README_de_DE_frami.txt
 %%DATADIR%%/hunspell_dictionaries/README_en_GB.txt
 %%DATADIR%%/hunspell_dictionaries/README_en_US.txt
 %%DATADIR%%/hunspell_dictionaries/README_es_ANY.txt
 %%DATADIR%%/hunspell_dictionaries/README_extension_owner.txt
 %%DATADIR%%/hunspell_dictionaries/README_fr.txt
 %%DATADIR%%/hunspell_dictionaries/README_hyph_de.txt
 %%DATADIR%%/hunspell_dictionaries/README_hyph_en_GB.txt
 %%DATADIR%%/hunspell_dictionaries/README_hyph_en_US.txt
 %%DATADIR%%/hunspell_dictionaries/README_hyph_es.txt
 %%DATADIR%%/hunspell_dictionaries/README_hyph_fr.txt
 %%DATADIR%%/hunspell_dictionaries/de_DE.aff
 %%DATADIR%%/hunspell_dictionaries/de_DE.dic
 %%DATADIR%%/hunspell_dictionaries/en_GB.aff
 %%DATADIR%%/hunspell_dictionaries/en_GB.dic
 %%DATADIR%%/hunspell_dictionaries/en_US.aff
 %%DATADIR%%/hunspell_dictionaries/en_US.dic
 %%DATADIR%%/hunspell_dictionaries/es.aff
 %%DATADIR%%/hunspell_dictionaries/es.dic
 %%DATADIR%%/hunspell_dictionaries/fr.aff
 %%DATADIR%%/hunspell_dictionaries/fr.dic
 %%DATADIR%%/hunspell_dictionaries/hyph_de_DE.dic
 %%DATADIR%%/hunspell_dictionaries/hyph_en_GB.dic
 %%DATADIR%%/hunspell_dictionaries/hyph_en_US.dic
 %%DATADIR%%/hunspell_dictionaries/hyph_es.dic
 %%DATADIR%%/hunspell_dictionaries/hyph_fr.dic
 %%DATADIR%%/hunspell_dictionaries/license.txt
 %%DATADIR%%/iconthemes/fluent.rcc
 %%DATADIR%%/iconthemes/main.rcc
 %%DATADIR%%/iconthemes/material.rcc
 %%DATADIR%%/plugin_launchers/python/bookcontainer.py
 %%DATADIR%%/plugin_launchers/python/compatibility_utils.py
 %%DATADIR%%/plugin_launchers/python/epub_utils.py
 %%DATADIR%%/plugin_launchers/python/hrefutils.py
 %%DATADIR%%/plugin_launchers/python/inputcontainer.py
 %%DATADIR%%/plugin_launchers/python/launcher.py
 %%DATADIR%%/plugin_launchers/python/navprocessor.py
 %%DATADIR%%/plugin_launchers/python/opf_parser.py
 %%DATADIR%%/plugin_launchers/python/outputcontainer.py
 %%DATADIR%%/plugin_launchers/python/pluginhunspell.py
 %%DATADIR%%/plugin_launchers/python/pluginhunspellml.py
 %%DATADIR%%/plugin_launchers/python/preferences.py
 %%DATADIR%%/plugin_launchers/python/quickparser.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/AUTHORS.txt
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/COPYING.txt
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/__init__.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/builder/__init__.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/builder/_html5lib.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/builder/_htmlparser.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/builder/_lxml.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/dammit.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/diagnose.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/element.py
 %%DATADIR%%/plugin_launchers/python/sigil_bs4/sigil_custom_changes_to_bs4-4.4.0.patch.txt
 %%DATADIR%%/plugin_launchers/python/sigil_gumbo_bs4_adapter.py
 %%DATADIR%%/plugin_launchers/python/sigil_gumboc.py
 %%DATADIR%%/plugin_launchers/python/sigil_gumboc_tags.py
 %%DATADIR%%/plugin_launchers/python/unipath.py
 %%DATADIR%%/plugin_launchers/python/validationcontainer.py
 %%DATADIR%%/plugin_launchers/python/validationresult.py
 %%DATADIR%%/plugin_launchers/python/wrapper.py
 %%DATADIR%%/polyfills/custom-mathjax.min.js
 %%DATADIR%%/python3lib/cssreformatter.py
 %%DATADIR%%/python3lib/diffstat.py
+%%DATADIR%%/python3lib/fix_opf_ids.py
 %%DATADIR%%/python3lib/gencheck.py
 %%DATADIR%%/python3lib/metadata_utils.py
 %%DATADIR%%/python3lib/metaproc2.py
 %%DATADIR%%/python3lib/metaproc3.py
 %%DATADIR%%/python3lib/ncxdata.py
 %%DATADIR%%/python3lib/ncxgenerator.py
 %%DATADIR%%/python3lib/opf2data.py
 %%DATADIR%%/python3lib/opf3data.py
+%%DATADIR%%/python3lib/opf_id_parser.py
 %%DATADIR%%/python3lib/opf_newparser.py
 %%DATADIR%%/python3lib/repomanager.py
 %%DATADIR%%/python3lib/sanitycheck.py
 %%DATADIR%%/python3lib/sdifflibparser.py
+%%DATADIR%%/python3lib/unidecode/LICENSE
+%%DATADIR%%/python3lib/unidecode/README.rst
+%%DATADIR%%/python3lib/unidecode/__init__.py
+%%DATADIR%%/python3lib/unidecode/__main__.py
+%%DATADIR%%/python3lib/unidecode/py.typed
+%%DATADIR%%/python3lib/unidecode/util.py
+%%DATADIR%%/python3lib/unidecode/x000.py
+%%DATADIR%%/python3lib/unidecode/x001.py
+%%DATADIR%%/python3lib/unidecode/x002.py
+%%DATADIR%%/python3lib/unidecode/x003.py
+%%DATADIR%%/python3lib/unidecode/x004.py
+%%DATADIR%%/python3lib/unidecode/x005.py
+%%DATADIR%%/python3lib/unidecode/x006.py
+%%DATADIR%%/python3lib/unidecode/x007.py
+%%DATADIR%%/python3lib/unidecode/x009.py
+%%DATADIR%%/python3lib/unidecode/x00a.py
+%%DATADIR%%/python3lib/unidecode/x00b.py
+%%DATADIR%%/python3lib/unidecode/x00c.py
+%%DATADIR%%/python3lib/unidecode/x00d.py
+%%DATADIR%%/python3lib/unidecode/x00e.py
+%%DATADIR%%/python3lib/unidecode/x00f.py
+%%DATADIR%%/python3lib/unidecode/x010.py
+%%DATADIR%%/python3lib/unidecode/x011.py
+%%DATADIR%%/python3lib/unidecode/x012.py
+%%DATADIR%%/python3lib/unidecode/x013.py
+%%DATADIR%%/python3lib/unidecode/x014.py
+%%DATADIR%%/python3lib/unidecode/x015.py
+%%DATADIR%%/python3lib/unidecode/x016.py
+%%DATADIR%%/python3lib/unidecode/x017.py
+%%DATADIR%%/python3lib/unidecode/x018.py
+%%DATADIR%%/python3lib/unidecode/x01d.py
+%%DATADIR%%/python3lib/unidecode/x01e.py
+%%DATADIR%%/python3lib/unidecode/x01f.py
+%%DATADIR%%/python3lib/unidecode/x020.py
+%%DATADIR%%/python3lib/unidecode/x021.py
+%%DATADIR%%/python3lib/unidecode/x022.py
+%%DATADIR%%/python3lib/unidecode/x023.py
+%%DATADIR%%/python3lib/unidecode/x024.py
+%%DATADIR%%/python3lib/unidecode/x025.py
+%%DATADIR%%/python3lib/unidecode/x026.py
+%%DATADIR%%/python3lib/unidecode/x027.py
+%%DATADIR%%/python3lib/unidecode/x028.py
+%%DATADIR%%/python3lib/unidecode/x029.py
+%%DATADIR%%/python3lib/unidecode/x02a.py
+%%DATADIR%%/python3lib/unidecode/x02c.py
+%%DATADIR%%/python3lib/unidecode/x02e.py
+%%DATADIR%%/python3lib/unidecode/x02f.py
+%%DATADIR%%/python3lib/unidecode/x030.py
+%%DATADIR%%/python3lib/unidecode/x031.py
+%%DATADIR%%/python3lib/unidecode/x032.py
+%%DATADIR%%/python3lib/unidecode/x033.py
+%%DATADIR%%/python3lib/unidecode/x04d.py
+%%DATADIR%%/python3lib/unidecode/x04e.py
+%%DATADIR%%/python3lib/unidecode/x04f.py
+%%DATADIR%%/python3lib/unidecode/x050.py
+%%DATADIR%%/python3lib/unidecode/x051.py
+%%DATADIR%%/python3lib/unidecode/x052.py
+%%DATADIR%%/python3lib/unidecode/x053.py
+%%DATADIR%%/python3lib/unidecode/x054.py
+%%DATADIR%%/python3lib/unidecode/x055.py
+%%DATADIR%%/python3lib/unidecode/x056.py
+%%DATADIR%%/python3lib/unidecode/x057.py
+%%DATADIR%%/python3lib/unidecode/x058.py
+%%DATADIR%%/python3lib/unidecode/x059.py
+%%DATADIR%%/python3lib/unidecode/x05a.py
+%%DATADIR%%/python3lib/unidecode/x05b.py
+%%DATADIR%%/python3lib/unidecode/x05c.py
+%%DATADIR%%/python3lib/unidecode/x05d.py
+%%DATADIR%%/python3lib/unidecode/x05e.py
+%%DATADIR%%/python3lib/unidecode/x05f.py
+%%DATADIR%%/python3lib/unidecode/x060.py
+%%DATADIR%%/python3lib/unidecode/x061.py
+%%DATADIR%%/python3lib/unidecode/x062.py
+%%DATADIR%%/python3lib/unidecode/x063.py
+%%DATADIR%%/python3lib/unidecode/x064.py
+%%DATADIR%%/python3lib/unidecode/x065.py
+%%DATADIR%%/python3lib/unidecode/x066.py
+%%DATADIR%%/python3lib/unidecode/x067.py
+%%DATADIR%%/python3lib/unidecode/x068.py
+%%DATADIR%%/python3lib/unidecode/x069.py
+%%DATADIR%%/python3lib/unidecode/x06a.py
+%%DATADIR%%/python3lib/unidecode/x06b.py
+%%DATADIR%%/python3lib/unidecode/x06c.py
+%%DATADIR%%/python3lib/unidecode/x06d.py
+%%DATADIR%%/python3lib/unidecode/x06e.py
+%%DATADIR%%/python3lib/unidecode/x06f.py
+%%DATADIR%%/python3lib/unidecode/x070.py
+%%DATADIR%%/python3lib/unidecode/x071.py
+%%DATADIR%%/python3lib/unidecode/x072.py
+%%DATADIR%%/python3lib/unidecode/x073.py
+%%DATADIR%%/python3lib/unidecode/x074.py
+%%DATADIR%%/python3lib/unidecode/x075.py
+%%DATADIR%%/python3lib/unidecode/x076.py
+%%DATADIR%%/python3lib/unidecode/x077.py
+%%DATADIR%%/python3lib/unidecode/x078.py
+%%DATADIR%%/python3lib/unidecode/x079.py
+%%DATADIR%%/python3lib/unidecode/x07a.py
+%%DATADIR%%/python3lib/unidecode/x07b.py
+%%DATADIR%%/python3lib/unidecode/x07c.py
+%%DATADIR%%/python3lib/unidecode/x07d.py
+%%DATADIR%%/python3lib/unidecode/x07e.py
+%%DATADIR%%/python3lib/unidecode/x07f.py
+%%DATADIR%%/python3lib/unidecode/x080.py
+%%DATADIR%%/python3lib/unidecode/x081.py
+%%DATADIR%%/python3lib/unidecode/x082.py
+%%DATADIR%%/python3lib/unidecode/x083.py
+%%DATADIR%%/python3lib/unidecode/x084.py
+%%DATADIR%%/python3lib/unidecode/x085.py
+%%DATADIR%%/python3lib/unidecode/x086.py
+%%DATADIR%%/python3lib/unidecode/x087.py
+%%DATADIR%%/python3lib/unidecode/x088.py
+%%DATADIR%%/python3lib/unidecode/x089.py
+%%DATADIR%%/python3lib/unidecode/x08a.py
+%%DATADIR%%/python3lib/unidecode/x08b.py
+%%DATADIR%%/python3lib/unidecode/x08c.py
+%%DATADIR%%/python3lib/unidecode/x08d.py
+%%DATADIR%%/python3lib/unidecode/x08e.py
+%%DATADIR%%/python3lib/unidecode/x08f.py
+%%DATADIR%%/python3lib/unidecode/x090.py
+%%DATADIR%%/python3lib/unidecode/x091.py
+%%DATADIR%%/python3lib/unidecode/x092.py
+%%DATADIR%%/python3lib/unidecode/x093.py
+%%DATADIR%%/python3lib/unidecode/x094.py
+%%DATADIR%%/python3lib/unidecode/x095.py
+%%DATADIR%%/python3lib/unidecode/x096.py
+%%DATADIR%%/python3lib/unidecode/x097.py
+%%DATADIR%%/python3lib/unidecode/x098.py
+%%DATADIR%%/python3lib/unidecode/x099.py
+%%DATADIR%%/python3lib/unidecode/x09a.py
+%%DATADIR%%/python3lib/unidecode/x09b.py
+%%DATADIR%%/python3lib/unidecode/x09c.py
+%%DATADIR%%/python3lib/unidecode/x09d.py
+%%DATADIR%%/python3lib/unidecode/x09e.py
+%%DATADIR%%/python3lib/unidecode/x09f.py
+%%DATADIR%%/python3lib/unidecode/x0a0.py
+%%DATADIR%%/python3lib/unidecode/x0a1.py
+%%DATADIR%%/python3lib/unidecode/x0a2.py
+%%DATADIR%%/python3lib/unidecode/x0a3.py
+%%DATADIR%%/python3lib/unidecode/x0a4.py
+%%DATADIR%%/python3lib/unidecode/x0ac.py
+%%DATADIR%%/python3lib/unidecode/x0ad.py
+%%DATADIR%%/python3lib/unidecode/x0ae.py
+%%DATADIR%%/python3lib/unidecode/x0af.py
+%%DATADIR%%/python3lib/unidecode/x0b0.py
+%%DATADIR%%/python3lib/unidecode/x0b1.py
+%%DATADIR%%/python3lib/unidecode/x0b2.py
+%%DATADIR%%/python3lib/unidecode/x0b3.py
+%%DATADIR%%/python3lib/unidecode/x0b4.py
+%%DATADIR%%/python3lib/unidecode/x0b5.py
+%%DATADIR%%/python3lib/unidecode/x0b6.py
+%%DATADIR%%/python3lib/unidecode/x0b7.py
+%%DATADIR%%/python3lib/unidecode/x0b8.py
+%%DATADIR%%/python3lib/unidecode/x0b9.py
+%%DATADIR%%/python3lib/unidecode/x0ba.py
+%%DATADIR%%/python3lib/unidecode/x0bb.py
+%%DATADIR%%/python3lib/unidecode/x0bc.py
+%%DATADIR%%/python3lib/unidecode/x0bd.py
+%%DATADIR%%/python3lib/unidecode/x0be.py
+%%DATADIR%%/python3lib/unidecode/x0bf.py
+%%DATADIR%%/python3lib/unidecode/x0c0.py
+%%DATADIR%%/python3lib/unidecode/x0c1.py
+%%DATADIR%%/python3lib/unidecode/x0c2.py
+%%DATADIR%%/python3lib/unidecode/x0c3.py
+%%DATADIR%%/python3lib/unidecode/x0c4.py
+%%DATADIR%%/python3lib/unidecode/x0c5.py
+%%DATADIR%%/python3lib/unidecode/x0c6.py
+%%DATADIR%%/python3lib/unidecode/x0c7.py
+%%DATADIR%%/python3lib/unidecode/x0c8.py
+%%DATADIR%%/python3lib/unidecode/x0c9.py
+%%DATADIR%%/python3lib/unidecode/x0ca.py
+%%DATADIR%%/python3lib/unidecode/x0cb.py
+%%DATADIR%%/python3lib/unidecode/x0cc.py
+%%DATADIR%%/python3lib/unidecode/x0cd.py
+%%DATADIR%%/python3lib/unidecode/x0ce.py
+%%DATADIR%%/python3lib/unidecode/x0cf.py
+%%DATADIR%%/python3lib/unidecode/x0d0.py
+%%DATADIR%%/python3lib/unidecode/x0d1.py
+%%DATADIR%%/python3lib/unidecode/x0d2.py
+%%DATADIR%%/python3lib/unidecode/x0d3.py
+%%DATADIR%%/python3lib/unidecode/x0d4.py
+%%DATADIR%%/python3lib/unidecode/x0d5.py
+%%DATADIR%%/python3lib/unidecode/x0d6.py
+%%DATADIR%%/python3lib/unidecode/x0d7.py
+%%DATADIR%%/python3lib/unidecode/x0f9.py
+%%DATADIR%%/python3lib/unidecode/x0fa.py
+%%DATADIR%%/python3lib/unidecode/x0fb.py
+%%DATADIR%%/python3lib/unidecode/x0fc.py
+%%DATADIR%%/python3lib/unidecode/x0fd.py
+%%DATADIR%%/python3lib/unidecode/x0fe.py
+%%DATADIR%%/python3lib/unidecode/x0ff.py
+%%DATADIR%%/python3lib/unidecode/x1d4.py
+%%DATADIR%%/python3lib/unidecode/x1d5.py
+%%DATADIR%%/python3lib/unidecode/x1d6.py
+%%DATADIR%%/python3lib/unidecode/x1d7.py
+%%DATADIR%%/python3lib/unidecode/x1f1.py
+%%DATADIR%%/python3lib/unidecode/x1f6.py
 %%DATADIR%%/python3lib/updatechecker.py
 %%DATADIR%%/python3lib/xmlprocessor.py
 %%DATADIR%%/python3lib/xmlsanitycheck.py
 %%DATADIR%%/translations/sigil_de.qm
 %%DATADIR%%/translations/sigil_en.qm
 %%DATADIR%%/translations/sigil_es.qm
 %%DATADIR%%/translations/sigil_fi.qm
 %%DATADIR%%/translations/sigil_fr.qm
 %%DATADIR%%/translations/sigil_it.qm
 %%DATADIR%%/translations/sigil_ja.qm
 %%DATADIR%%/translations/sigil_ko.qm
 %%DATADIR%%/translations/sigil_nl.qm
 %%DATADIR%%/translations/sigil_pl.qm
 %%DATADIR%%/translations/sigil_pt_BR.qm
 %%DATADIR%%/translations/sigil_ru.qm
 %%DATADIR%%/translations/sigil_sr.qm
 %%DATADIR%%/translations/sigil_tr.qm
 %%DATADIR%%/translations/sigil_uk.qm
 %%DATADIR%%/translations/sigil_zh_CN.qm
 %%DATADIR%%/translations/sigil_zh_TW.qm