diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 129425d95fc9..d740d93ed85c 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -1,43 +1,41 @@
 PORTNAME=	mousepad
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.4
 CATEGORIES=	editors xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Simple text editor for the Xfce Desktop
 WWW=		https://git.xfce.org/apps/mousepad/about/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
-
-USES=		desktop-file-utils gettext-tools gmake gnome libtool perl5 \
-		pkgconfig tar:bzip2 xfce
-USE_GNOME=	cairo gdkpixbuf glib20 gtk30 gtksourceview3 intltool
+USES=		cmake:indirect desktop-file-utils gettext-tools gnome libtool \
+		meson perl5 pkgconfig tar:xz xfce
+USE_GNOME=	gdkpixbuf glib20 gtk30 gtksourceview4 intltool
 GLIB_SCHEMAS=	org.xfce.mousepad.gschema.xml
 USE_LDCONFIG=	yes
-
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+MESON_ARGS=	-Dpolkit=enabled \
+		-Dgtksourceview4=enabled
 
 OPTIONS_DEFINE=		NLS SHORTCUTS SPELL
 OPTIONS_DEFAULT=	SHORTCUTS SPELL
 OPTIONS_SUB=		yes
 
-SHORTCUTS_DESC=		Shortcuts editor plugin
-SPELL_DESC=		Spell checking plugin
+SHORTCUTS_DESC=	Shortcuts editor plugin
+SPELL_DESC=	Spell checking plugin
 
-NLS_USES=		gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext-runtime
 
-SHORTCUTS_USE=		XFCE=libmenu,xfconf
-SHORTCUTS_CONFIGURE_ENABLE=	plugin-shortcuts
+SHORTCUTS_USE=			XFCE=libmenu,xfconf
+SHORTCUTS_MESON_ENABLED=	shortcuts-plugin
 
-SPELL_LIB_DEPENDS=	libenchant-2.so:textproc/enchant2 \
-			libgspell-1.so:textproc/gspell
-SPELL_CONFIGURE_ENABLE=	plugin-gspell
+SPELL_LIB_DEPENDS=	libgspell-1.so:textproc/gspell
+SPELL_MESON_ENABLED=	gspell-plugin
 SPELL_VARS=		GLIB_SCHEMAS+=org.xfce.mousepad.plugins.gspell.gschema.xml
 
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
+
 .include <bsd.port.mk>
diff --git a/editors/mousepad/distinfo b/editors/mousepad/distinfo
index d79758fab8a3..820846224666 100644
--- a/editors/mousepad/distinfo
+++ b/editors/mousepad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1729539659
-SHA256 (xfce4/mousepad-0.6.3.tar.bz2) = 2ff162c185f18014ab9c82c2ac2dfce4fba20eb0005e7690ee27f00b9cb929b9
-SIZE (xfce4/mousepad-0.6.3.tar.bz2) = 1428583
+TIMESTAMP = 1742934433
+SHA256 (xfce4/mousepad-0.6.4.tar.xz) = 0aeb848e76a9a1e4186a5055328bbffdfdfae1b231db04b836b1816771c0db46
+SIZE (xfce4/mousepad-0.6.4.tar.xz) = 461356