diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index c3cc10fbfad5..0964f185d0d6 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -1,41 +1,31 @@
 PORTNAME=	gaupol
-DISTVERSION=	1.16
+DISTVERSION=	2.0
 CATEGORIES=	multimedia python
 
 MAINTAINER=	nxjoseph@FreeBSD.org
 COMMENT=	Subtitle editor
 WWW=		https://otsaloma.io/gaupol/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2.0:textproc/py-charset-normalizer@${PY_FLAVOR} \
-		gspell>=1.0.0:textproc/gspell \
-		iso-codes>=3.67:misc/iso-codes
+		libspelling>=0.2:x11-toolkits/libspelling \
+		iso-codes>=3.67:misc/iso-codes \
+		gstreamer1-plugins-rust>=0:multimedia/gstreamer1-plugins-rust
 
-USES=		desktop-file-utils gnome gstreamer python
+USES=		desktop-file-utils gettext-tools gnome gstreamer python
 USE_GITHUB=	yes
 GH_ACCOUNT=	otsaloma
 USE_GNOME=	gtk30 intltool pygobject3
 USE_GSTREAMER=	bad good gtk libav pango ugly
-USE_PYTHON=	autoplist distutils flavors
+USE_PYTHON=	autoplist flavors
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
-
-NLS_USES=	gettext-runtime gettext-tools
-NLS_USES_OFF=	gettext-tools
-
-.include <bsd.port.pre.mk>
-
-# PYDISTUTILS_INSTALLNOSINGLE is deprecated so...
-PYDISTUTILS_INSTALLARGS:=	${PYDISTUTILS_INSTALLARGS:N--single-version-externally-managed}
+ALL_TARGET=	build
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%STAGEDIR%%|"${STAGEDIR}"|' \
-		-e 's|%%PREFIX%%|"${PREFIX}"|' \
-		-e 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \
-		${WRKSRC}/setup.py
+	@${REINPLACE_CMD} 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \
+		${WRKSRC}/bin/gaupol.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/gaupol/distinfo b/multimedia/gaupol/distinfo
index 2cd3e7d5d6fd..95f145d004e2 100644
--- a/multimedia/gaupol/distinfo
+++ b/multimedia/gaupol/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1777503823
-SHA256 (otsaloma-gaupol-1.16_GH0.tar.gz) = ea45025d8de5f5a089d4626085a4f1ed7d7e021462a30aa777728e32327d71ca
-SIZE (otsaloma-gaupol-1.16_GH0.tar.gz) = 594322
+TIMESTAMP = 1786359889
+SHA256 (otsaloma-gaupol-2.0_GH0.tar.gz) = 83a3ee65a77f5dd5305eaddeb066964e5fb84c604e0a37b15e7b0e763fac98cb
+SIZE (otsaloma-gaupol-2.0_GH0.tar.gz) = 645360
diff --git a/multimedia/gaupol/files/patch-setup.py b/multimedia/gaupol/files/patch-setup.py
deleted file mode 100644
index c05947674627..000000000000
--- a/multimedia/gaupol/files/patch-setup.py
+++ /dev/null
@@ -1,28 +0,0 @@
---- setup.py.orig	2026-04-13 19:35:05 UTC
-+++ setup.py
-@@ -102,12 +102,10 @@ class Clean(clean):
-             for targets in [glob.glob(x.strip()) for x in f]:
-                 for target in filter(os.path.isdir, targets):
-                     log.info("removing {}".format(target))
--                    if not self.dry_run:
--                        shutil.rmtree(target)
-+                    shutil.rmtree(target)
-                 for target in filter(os.path.isfile, targets):
-                     log.info("removing {}".format(target))
--                    if not self.dry_run:
--                        os.remove(target)
-+                    os.remove(target)
- 
- 
- class Distribution(distribution):
-@@ -219,7 +217,9 @@ class InstallData(install_data):
-         data_dir = get_command_obj("install_data").install_dir
-         data_dir = os.path.join(data_dir, "share", "gaupol")
-         files = glob.glob("{}/extensions/*/*.py".format(data_dir))
--        distutils.util.byte_compile(files, optimize, self.force, self.dry_run)
-+        distutils.util.byte_compile(files, optimize, self.force,
-+                                    base_dir=%%PREFIX%%,
-+                                    prefix=%%STAGEDIR%%,)
-         # Figure out paths of the compiled files and add them to
-         # self.outfiles so that 'setup.py --record' works correctly.
-         def get_cache_pattern(path):