diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index a54fc99e3148..610c7c8409ec 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -1,33 +1,43 @@
 # Created by: Oliver Lehmann <oliver@FreeBSD.org>
 
 PORTNAME=	mousepad
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	editors xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Simple text editor for the Xfce Desktop
 
 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 dconf gdkpixbuf2 glib20 gtk30 gtksourceview3 intlhack \
-		intltool
-USE_XFCE=	xfconf
+USE_GNOME=	cairo dconf gdkpixbuf2 glib20 gtk30 gtksourceview3 intltool
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.xfce.mousepad.gschema.xml
 
-OPTIONS_DEFINE=		NLS
+OPTIONS_DEFINE=		NLS SPELL
+OPTIONS_DEFAULT=	SPELL
 OPTIONS_SUB=		yes
 
+SPELL_DESC=		Spell checking plugin
+
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
+SPELL_CONFIGURE_ENABLE=	plugin-gspell
+SPELL_LIB_DEPENDS=	libgspell-1.so:textproc/gspell \
+			libenchant-2.so:textproc/enchant2
+SPELL_VARS=		GLIB_SCHEMAS+=org.xfce.mousepad.plugins.gspell.gschema.xml
+
 .include <bsd.port.mk>
diff --git a/editors/mousepad/pkg-plist b/editors/mousepad/pkg-plist
index 0c2a92d3b181..bc953b801ad1 100644
--- a/editors/mousepad/pkg-plist
+++ b/editors/mousepad/pkg-plist
@@ -1,65 +1,66 @@
 bin/mousepad
 lib/libmousepad.so
 lib/libmousepad.so.0
 lib/libmousepad.so.0.0.0
+%%SPELL%%lib/mousepad/plugins/libmousepad-plugin-gspell.so
 share/applications/mousepad-settings.desktop
 share/applications/mousepad.desktop
 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
 share/icons/hicolor/scalable/apps/org.xfce.mousepad.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/be/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/da/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/de/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/el/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/en_AU/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/es/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/et/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/fa_IR/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/he/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/hy_AM/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/hye/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/id/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ie/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/is/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/it/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/oc/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/te/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/th/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mousepad.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mousepad.mo
 share/metainfo/mousepad.appdata.xml
 share/polkit-1/actions/org.xfce.mousepad.policy