diff --git a/editors/xfce4-mousepad/Makefile b/editors/xfce4-mousepad/Makefile
index f7cf92681595..bc2687951d45 100644
--- a/editors/xfce4-mousepad/Makefile
+++ b/editors/xfce4-mousepad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2021/05/12 00:10:58 gutteridge Exp $
+# $NetBSD: Makefile,v 1.58 2021/11/30 00:45:38 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-VERSION=	0.5.4
+VERSION=	0.5.7
 DISTNAME=	mousepad-${VERSION}
 PKGNAME=	xfce4-mousepad-${VERSION}
 CATEGORIES=	editors
@@ -13,8 +13,9 @@ COMMENT=	Xfce text editor
 
 CONFIGURE_ARGS+=	--enable-gtksourceview4
 
+.include "options.mk"
+
 .include "../../devel/glib2/schemas.mk"
-.include "../../devel/xfce4-conf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtksourceview4/buildlink3.mk"
diff --git a/editors/xfce4-mousepad/PLIST b/editors/xfce4-mousepad/PLIST
index 5d5d8b9af42b..1cf8001accb6 100644
--- a/editors/xfce4-mousepad/PLIST
+++ b/editors/xfce4-mousepad/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2020/12/01 05:11:53 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/11/30 00:45:38 gutteridge Exp $
 bin/mousepad
-share/applications/mousepad.desktop
+lib/libmousepad.la
+${PLIST.gspell}lib/mousepad/plugins/libmousepad-plugin-gspell.la
+share/applications/org.xfce.mousepad-settings.desktop
+share/applications/org.xfce.mousepad.desktop
 share/glib-2.0/schemas/org.xfce.mousepad.gschema.xml
+${PLIST.gspell}share/glib-2.0/schemas/org.xfce.mousepad.plugins.gspell.gschema.xml
 share/icons/hicolor/128x128/apps/org.xfce.mousepad.png
 share/icons/hicolor/16x16/apps/org.xfce.mousepad.png
 share/icons/hicolor/48x48/apps/org.xfce.mousepad.png
@@ -20,6 +24,7 @@ share/locale/en_GB/LC_MESSAGES/mousepad.mo
 share/locale/es/LC_MESSAGES/mousepad.mo
 share/locale/et/LC_MESSAGES/mousepad.mo
 share/locale/eu/LC_MESSAGES/mousepad.mo
+share/locale/fa_IR/LC_MESSAGES/mousepad.mo
 share/locale/fi/LC_MESSAGES/mousepad.mo
 share/locale/fr/LC_MESSAGES/mousepad.mo
 share/locale/gl/LC_MESSAGES/mousepad.mo
@@ -58,5 +63,5 @@ share/locale/ug/LC_MESSAGES/mousepad.mo
 share/locale/uk/LC_MESSAGES/mousepad.mo
 share/locale/zh_CN/LC_MESSAGES/mousepad.mo
 share/locale/zh_TW/LC_MESSAGES/mousepad.mo
-share/metainfo/mousepad.appdata.xml
+share/metainfo/org.xfce.mousepad.appdata.xml
 share/polkit-1/actions/org.xfce.mousepad.policy
diff --git a/editors/xfce4-mousepad/distinfo b/editors/xfce4-mousepad/distinfo
index 97d8de9c64f7..6590992808b5 100644
--- a/editors/xfce4-mousepad/distinfo
+++ b/editors/xfce4-mousepad/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:21:43 nia Exp $
+$NetBSD: distinfo,v 1.15 2021/11/30 00:45:38 gutteridge Exp $
 
-BLAKE2s (mousepad-0.5.4.tar.bz2) = 864a0b0cc921083c37212a04834f2cb6eca20d005aaf982cd1b00e4d15658c20
-SHA512 (mousepad-0.5.4.tar.bz2) = 52d1d9b235b13a651ee7e6e1633074c7829c27e880033637eacdd7cd63f246d1f47d0cd2c981cf2a7eb96dbb7119204a685f00a60968e4478d5057bce8500370
-Size (mousepad-0.5.4.tar.bz2) = 855416 bytes
+BLAKE2s (mousepad-0.5.7.tar.bz2) = 74418120aeae260216861e46be46c48f3a7b67feff1bd697950ae81d49800a85
+SHA512 (mousepad-0.5.7.tar.bz2) = 0302fbf0d5e7ffe20a7f712dd0dc5878552572ec77798ed329b0e5688c0d4f80c5aa527f9fadb2de7452c8983bf1efd0e117ed7c170b0ca79e09006617f357ac
+Size (mousepad-0.5.7.tar.bz2) = 920371 bytes
diff --git a/editors/xfce4-mousepad/options.mk b/editors/xfce4-mousepad/options.mk
new file mode 100644
index 000000000000..dec7f1966cf7
--- /dev/null
+++ b/editors/xfce4-mousepad/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2021/11/30 00:45:38 gutteridge Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mousepad
+PKG_SUPPORTED_OPTIONS=	gspell
+PKG_SUGGESTED_OPTIONS=	gspell
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS=	gspell
+
+.if !empty(PKG_OPTIONS:Mgspell)
+.include "../../textproc/gspell/buildlink3.mk"
+PLIST.gspell=	yes
+CONFIGURE_ARGS+=	--enable-plugin-gspell
+.else
+CONFIGURE_ARGS+=	--disable-plugin-gspell
+.endif